| commit | f0b75fcc810abaca317f7d82d25c538da95c6987 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:39 +0000 (11 23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:32 +0000 (14 14:19 -0700) | ||
| tree | b4f9ee58e7ff33c438765c26aaf7bac61f6aefb1 | treesnapshot (tar.gz zip) |
| parent | ac6e839241009459b46e860f9d7fc524bb9ecc0b | commitdiff |
t6042: Ensure rename/rename conflicts leave index and workdir in sane state
rename/rename conflicts, both with one file being renamed to two different
files and with two files being renamed to the same file, should leave the
index and the working copy in a sane state with appropriate conflict
recording, auxiliary files, etc. Git seems to handle one of the two cases
alright, but has some problems with the two files being renamed to one
case. Add tests for both cases.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rename/rename conflicts, both with one file being renamed to two different
files and with two files being renamed to the same file, should leave the
index and the working copy in a sane state with appropriate conflict
recording, auxiliary files, etc. Git seems to handle one of the two cases
alright, but has some problems with the two files being renamed to one
case. Add tests for both cases.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6042-merge-rename-corner-cases.sh | diffblobblamehistory |