diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 08:29:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 00:37:04 (GMT) |
| commit | a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d (patch) | |
| tree | f8f06b2f4d13cbb721a17892ee543d5b6265bdb7 /t/t6022-merge-rename.sh | |
| parent | 71f7ffcc02a2f38436c59146b86897389130a538 (diff) | |
| download | git-a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d.zip git-a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d.tar.gz git-a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d.tar.bz2 | |
conflict_rename_delete(): Check whether D/F conflicts are still present
If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
| -rwxr-xr-x | t/t6022-merge-rename.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index edbfa47..9bf190e 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -549,7 +549,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co git commit -m "Conflicts in the way" ' -test_expect_failure 'both rename source and destination involved in D/F conflict' ' +test_expect_success 'both rename source and destination involved in D/F conflict' ' git reset --hard && rm -rf dir~* && git checkout -q rename-dest^0 && @@ -589,7 +589,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' ' git commit -m "Rename one/file -> two" ' -test_expect_failure 'pair rename to parent of other (D/F conflicts) w/ untracked dir' ' +test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' ' git checkout -q rename-one^0 && mkdir one && test_must_fail git merge --strategy=recursive rename-two && |