GNU bug report logs - #32388
26.1: ediff-merge-directories-with-ancestor and subdirectories

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 7 Aug 2018 15:09:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 07 11:09:18 2018
Received: from localhost ([127.0.0.1]:43807 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1fn3bq-0007a9-Dy
	for submit <at> 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 <ludovic@HIDDEN>) id 1fn3bo-0007Zw-E3
 for submit <at> 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 <ludovic@HIDDEN>) id 1fn3bi-0003pI-FM
 for submit <at> 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 <ludovic@HIDDEN>)
 id 1fn3bi-0003pD-Ak
 for submit <at> 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 <ludovic@HIDDEN>) id 1fn3bf-0000ns-2u
 for bug-gnu-emacs@HIDDEN; Tue, 07 Aug 2018 11:09:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <ludovic@HIDDEN>) id 1fn3bb-0003nU-2T
 for bug-gnu-emacs@HIDDEN; 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 <ludovic@HIDDEN>) id 1fn3ba-0003lc-SD
 for bug-gnu-emacs@HIDDEN; 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: <bug-gnu-emacs@HIDDEN>
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 <ludovic@HIDDEN>
Message-ID: <c45858b08c6e2b1623448f4b888b9115@HIDDEN>
X-Sender: ludovic@HIDDEN
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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.