| commit | 4f6339b0c353b5c03b566b605e50a743d97fc08e | |
| author | Pickens, James E <james.e.pickens@intel.com> | |
| Wed, 29 Jul 2009 21:02:39 +0000 (29 14:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Jul 2009 03:18:25 +0000 (29 20:18 -0700) | ||
| tree | c064c9d111973117579aaa0fee2fc95e93288579 | treesnapshot (tar.gz zip) |
| parent | 0a53e9ddeaddad63ad106860237bbf53411d11a7 | commitdiff |
Demonstrate bugs when a directory is replaced with a symlink
This test creates two directories, a/b and a/b-2, then replaces a/b with
a symlink to a/b-2, then merges that change into the 'baseline' commit,
which contains an unrelated change.
There are two bugs:
1. 'git checkout' incorrectly deletes work tree file a/b-2/d.
2. 'git merge' incorrectly deletes work tree file a/b-2/d.
The test goes on to create another branch in which a/b-2 is replaced
with a symlink to a/b (i.e., the reverse of what was done the first
time), and merge it into the 'baseline' commit.
There is a different bug:
3. The merge should be clean, but git reports a conflict.
Signed-off-by: James Pickens <james.e.pickens@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This test creates two directories, a/b and a/b-2, then replaces a/b with
a symlink to a/b-2, then merges that change into the 'baseline' commit,
which contains an unrelated change.
There are two bugs:
1. 'git checkout' incorrectly deletes work tree file a/b-2/d.
2. 'git merge' incorrectly deletes work tree file a/b-2/d.
The test goes on to create another branch in which a/b-2 is replaced
with a symlink to a/b (i.e., the reverse of what was done the first
time), and merge it into the 'baseline' commit.
There is a different bug:
3. The merge should be clean, but git reports a conflict.
Signed-off-by: James Pickens <james.e.pickens@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6035-merge-dir-to-symlink.sh | [new file with mode: 0755] | blob |