Received: from spf5.us4.outblaze.com (spf5.us4.outblaze.com [205.158.62.27])
	by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id i9D1hxgM009851
	for <migo@freeshell.org>; Wed, 13 Oct 2004 01:43:59 GMT
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
	by spf5.us4.outblaze.com (Postfix) with ESMTP id 6CC5976EC3
	for <migo@homemail.com>; Wed, 13 Oct 2004 01:44:01 +0000 (GMT)
Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1CHYIO-0001DJ-Jn
	for migo@homemail.com; Tue, 12 Oct 2004 21:51:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CHYHs-00015h-RH
	for gnu-arch-users@gnu.org; Tue, 12 Oct 2004 21:50:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CHYHs-00014p-19
	for gnu-arch-users@gnu.org; Tue, 12 Oct 2004 21:50:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CHYHr-00014J-Ry
	for gnu-arch-users@gnu.org; Tue, 12 Oct 2004 21:50:43 -0400
Received: from [69.93.10.50] (helo=spaghetti.theross.com)
	by monty-python.gnu.org with esmtp (TLSv1:RC4-SHA:128) (Exim 4.34)
	id 1CHYAg-00006T-Ld
	for gnu-arch-users@gnu.org; Tue, 12 Oct 2004 21:43:18 -0400
Received: from indigo by spaghetti.theross.com with local (Exim 4.34)
	id 1CHYAh-0006uE-7J
	for gnu-arch-users@gnu.org; Tue, 12 Oct 2004 21:43:19 -0400
Date: Tue, 12 Oct 2004 21:43:19 -0400
From: Phil Frost <indigo@bitglue.com>
To: gnu-arch-users@gnu.org
Message-ID: <20041013014319.GA26002@unununium.org>
Mail-Followup-To: gnu-arch-users@gnu.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.6+20040722i
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: indigo@unununium.org
X-SA-Exim-Scanned: No (on spaghetti.theross.com);
	SAEximRunCond expanded to false
Subject: [Gnu-arch-users] [BUG] merging new files into a renamed directory
	looses the file
X-BeenThere: gnu-arch-users@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: a discussion list for all things arch-ish <gnu-arch-users.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnu-arch-users>
List-Post: <mailto:gnu-arch-users@gnu.org>
List-Help: <mailto:gnu-arch-users-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=subscribe>
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 1167
Lines: 36
The scenario:

- Create a branch 'main' with an empty directory 'fu'.
- Tag from this branch two more branches, 'A' and 'B'.
- In 'A', add a file to the directory 'fu'. commit.
- Merge 'A' into 'main'
- In 'B', rename directory 'fu' to 'bar'. commit.
- star-merge 'main' into 'B'

Expected behavior:

after merging 'main' into 'B', the file that was added in 'A' is created
in the now renamed directory 'bar', formerly 'fu'.

Observed behavior:

after merging 'main' into 'B', a directory 'fu' is created, with the new
file in it. tree-lint reports this directory as "would be source if it
had an id."

tla version:

./src   lord@emf.net--2004/package-framework--devo--1.0--patch-5
./src/docs-hackerlab    lord@emf.net--2004/docs-hackerlab--devo--1.0--base-0
./src/docs-tla  lord@emf.net--2004/docs-tla--devo--1.0--patch-5
./src/hackerlab lord@emf.net--2004/hackerlab--devo--1.0--patch-96
./src/tla       lord@emf.net--2004/tla--devo--1.3--patch-30


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/