From unknown Tue Jun 17 01:49:51 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#32388 <32388@debbugs.gnu.org> To: bug#32388 <32388@debbugs.gnu.org> Subject: Status: 26.1: ediff-merge-directories-with-ancestor and subdirectories Reply-To: bug#32388 <32388@debbugs.gnu.org> Date: Tue, 17 Jun 2025 08:49:51 +0000 retitle 32388 26.1: ediff-merge-directories-with-ancestor and subdirectories reassign 32388 emacs submitter 32388 Ludovic Brenta severity 32388 minor tag 32388 confirmed thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 07 11:09:18 2018 Received: (at submit) by debbugs.gnu.org; 7 Aug 2018 15:09:18 +0000 Received: from localhost ([127.0.0.1]:43807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fn3bq-0007a9-Dy for submit@debbugs.gnu.org; Tue, 07 Aug 2018 11:09:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fn3bo-0007Zw-E3 for submit@debbugs.gnu.org; Tue, 07 Aug 2018 11:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fn3bi-0003pI-FM for submit@debbugs.gnu.org; Tue, 07 Aug 2018 11:09:11 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fn3bi-0003pD-Ak for submit@debbugs.gnu.org; Tue, 07 Aug 2018 11:09:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fn3bf-0000ns-2u for bug-gnu-emacs@gnu.org; Tue, 07 Aug 2018 11:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fn3bb-0003nU-2T for bug-gnu-emacs@gnu.org; Tue, 07 Aug 2018 11:09:07 -0400 Received: from rmap1.bookmyname.com ([88.191.249.149]:63528 helo=webmail.free.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fn3ba-0003lc-SD for bug-gnu-emacs@gnu.org; Tue, 07 Aug 2018 11:09:03 -0400 Received: by webmail.free.org (Postfix, from userid 5000) id DBD67507A595; Tue, 7 Aug 2018 17:08:56 +0200 (CEST) To: Subject: 26.1: ediff-merge-directories-with-ancestor and subdirectories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 07 Aug 2018 16:08:56 +0100 From: Ludovic Brenta Message-ID: X-Sender: ludovic@ludovic-brenta.org User-Agent: Roundcube Webmail/0.5.3 X-Complaints-To: abuse_at_bookmyname.com X-Abuse-Info: Please be sure to forward a copy of ALL headers X-Origin-Web-Site: webmail.bookmyname.com X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) Hello, Suppose I have set up four directory trees (by extracting from a version control system): your_view/foo/bar/baz.c other/foo/bar/baz.c ancestor/foo/bar/baz.c result/foo/bar/baz.c Each of the four directories can contain many more subdirectories and files. Now I start emacs like so: emacs --eval '(ediff-merge-directories-with-ancestor "your_view" "other" "ancestor" "." "result")' emacs properly starts an ediff session showing the three directories and defaulting to saving the merge results in "result" (the value of the fifth parameter, merge-autostore-dir). The only entry in this session is the subdirectory "foo". Moving to "foo" and hitting RET results in the prompt: Save merged files in directory: ~/..../your_view/ Inspecting the file ediff-mult.el I see that the function ediff-filegroup-action (bound to RET in the ediff session group panel) obtains the merge-autostore-dir from the ediff-meta-list of this buffer but fails to pass the merge-autostore-dir as a parameter to ediff-directories-internal (called at line 1877). It would be nice if ediff-filegroup-action would infer the merge-autostore-dir from that of the parent session and the name of the subdirectories, i.e. "result/foo/" in this case. This bug (or misfeature) is also present in 24.5.1. -- Ludovic Brenta. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 06 12:12:32 2019 Received: (at control) by debbugs.gnu.org; 6 Aug 2019 16:12:32 +0000 Received: from localhost ([127.0.0.1]:37684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv24e-0006x9-4I for submit@debbugs.gnu.org; Tue, 06 Aug 2019 12:12:32 -0400 Received: from mail-pl1-f174.google.com ([209.85.214.174]:40910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv24Z-0006wk-PP for control@debbugs.gnu.org; Tue, 06 Aug 2019 12:12:30 -0400 Received: by mail-pl1-f174.google.com with SMTP id a93so38000035pla.7 for ; Tue, 06 Aug 2019 09:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=AnGXvVwPWULaicb2Hzrpk2M+6gRiNs5sI9YJu2M9UCk=; b=JzPi1IWXoAj36oE+2takiMtnfTvNqkAseWFeXEHBaugfrsXrsSNhBEO9okBl0Y023c Z1FoDc8jnc2YG2Uc9ITeKPQljWMxvP/zjuX8fEWxzdQxQ11xUFdkzHlJ/Z8YdfK14LRi ZgciebDmYV8rEiATB2WLJinhsoOvvhOycRkCAUSZ0HV0+M3/XbXgTs3KiITtznHyoRUQ reRVByz2ZAC+gnjmLJM1Pq11DmSbqkcTIfnNfKelCdTP217i+Ik2KXaWPNEXPmFkeIJ+ FJL65b4x76mrXKnARYMyPpY2v8Sk9Jqe5d39XzFNLgjdtUMhOKIlw7H4f3/46TnbiZcZ iqhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=AnGXvVwPWULaicb2Hzrpk2M+6gRiNs5sI9YJu2M9UCk=; b=Vws3zX40CqDzdt2BOEpk50Y18kGsC5Prqojp3QCg8hZUj6Zpm17voGkHdwrdHrdIMu sz7V6wRrDjL3DjKmvwXgh89HcQCegtTDuVuEN11bo9tSdtX2i3LQZP6Vyp/9gHO6RQ/K 1hYlWWUs+jlER8Wm0kemzep2/DqHsPZl4K/TiFXk7MXC756llm9xbZ0tEVW16zHOmLvE nsTspq3JkHpYzxQBDf3qWKriYKfinUCHyH+GBEmO0XH3jMUXPCjv4+qWd8JGp1qQ96Oc RUQh5iQqSKIh7MpXKi1HrTtcKPm+XNzeTT6VWeoIpucbhYlcXhNes59ivEUJoGpyogLK BjIQ== X-Gm-Message-State: APjAAAWRpzLeVYz/9gCqh0q4VKk7vHUAsLMJXqY2PdXQheocRvgx9ry7 Vl4LEuizcxtpAinBFSdnI3zyiUrW X-Google-Smtp-Source: APXvYqwT6ZpZU2Q3ahNLULyy8Qg5IAWYD0Cqg+fd8UoZCUcYgn1sBMCJiE/yDg+m4jJDUnlJeYIkQA== X-Received: by 2002:a17:902:9a07:: with SMTP id v7mr3963248plp.245.1565107941507; Tue, 06 Aug 2019 09:12:21 -0700 (PDT) Received: from localhost.localdomain ([2409:4042:2805:27b9:2c1e:99b4:28f1:c2a2]) by smtp.gmail.com with ESMTPSA id 22sm17464536pgl.0.2019.08.06.09.12.18 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 09:12:20 -0700 (PDT) To: control@debbugs.gnu.org From: Akshay Gaikwad Subject: control message for bug #32388 Message-ID: <06f47ebc-c843-c6d2-d829-caa5b68038c2@gmail.com> Date: Tue, 6 Aug 2019 21:42:13 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) tag 32388 confirmed found 32388 27.0.50 quit