Message-ID: <416C897F.6080006@johnmeinel.com>
Date: Tue, 12 Oct 2004 20:48:47 -0500
From: John Meinel <tla@johnmeinel.com>
User-Agent: Mozilla Thunderbird 0.8 (Windows/20040913)
MIME-Version: 1.0
To: Phil Frost <indigo@bitglue.com>
Subject: Re: [Gnu-arch-users] [BUG] merging new files into a renamed directory
	looses the file
References: <20041013014319.GA26002@unununium.org>
In-Reply-To: <20041013014319.GA26002@unununium.org>
Cc: gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============0689066778=="
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: 3143
Lines: 95
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============0689066778==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig4153B08FFDC4ABF024B1FCF6"

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig4153B08FFDC4ABF024B1FCF6
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Phil Frost wrote:
> 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
> 
> 

This has actually been around for quite some time, and I know it's been 
debated in the past. (I've been one of the ones that brought it up.)

The issue is that right now when you add a file, the parent directories 
id is not included. (Partially this is because the root directory has no 
id.) So it's very difficult to determine (probably in some cases 
impossible) which directory was which.

The proposed solution IIRC, was to have patches contain the Id of the 
parent directory, and to have all directories (even root) have an id.

If this *is* the solution, it is more of a tla 2.0 change, since it 
means changing the archive format, and the local directory format.

If this hasn't been submitted as a bug in the past, thank you for 
submitting it now.

John
=:->

--------------enig4153B08FFDC4ABF024B1FCF6
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBbIl/JdeBCYSNAAMRAiV5AKCgdECDW/XPnzASlzXRyMtCPy6LvgCcCBhP
15twXiItbw02S/tHko54AYc=
=YTYp
-----END PGP SIGNATURE-----

--------------enig4153B08FFDC4ABF024B1FCF6--


--===============0689066778==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
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/
--===============0689066778==--