projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 588504b) | patch
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:40 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit52304ecddf9458dcf4321c89c96a5e1bc025676d
tree677072e6733d475d02132a8e002aee85b2d223fetree | snapshot
parent588504b694133cba85982fbace532d2156f859ebcommit | diff
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)

An interesting testcase is having two files each in their own subdirectory
getting renamed to the toplevel at the directory pathname of the other.
Questions arise as to whether the order of operations matters and whether
the directories can correctly get out of the way and make room for the
new files.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6022-merge-rename.sh diff | blob | history
Git—the stupid content tracker