[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] [BUG] merging new files into a renamed directory looses
From: |
Phil Frost |
Subject: |
[Gnu-arch-users] [BUG] merging new files into a renamed directory looses the file |
Date: |
Tue, 12 Oct 2004 21:43:19 -0400 |
User-agent: |
Mutt/1.5.6+20040722i |
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
- [Gnu-arch-users] [BUG] merging new files into a renamed directory looses the file,
Phil Frost <=