Re: [Gnu-arch-users] [BUG] merging new files into a renamed directory looses the file

[John Meinel]

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   address@hidden/package-framework--devo--1.0--patch-5
> ./src/docs-hackerlab    address@hidden/docs-hackerlab--devo--1.0--base-0
> ./src/docs-tla  address@hidden/docs-tla--devo--1.0--patch-5
> ./src/hackerlab address@hidden/hackerlab--devo--1.0--patch-96
> ./src/tla       address@hidden/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
=:->

signature.asc
Description: OpenPGP digital signature