Mercurial > hg > gitserve
diff tests/test-rename-merge2.out @ 3298:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 08 Oct 2006 19:57:45 -0500 |
| parents | 438b0638dbf5 |
| children | e7abcf3a7c5f |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Sat Oct 07 15:16:47 2006 -0400 +++ b/tests/test-rename-merge2.out Sun Oct 08 19:57:45 2006 -0500 @@ -42,6 +42,7 @@ -------------- M a M b + a -------------- -------------- @@ -85,6 +86,7 @@ (branch merge, don't forget to commit) -------------- M b + a -------------- -------------- @@ -128,6 +130,7 @@ (branch merge, don't forget to commit) -------------- M b + a C a -------------- @@ -172,6 +175,7 @@ (branch merge, don't forget to commit) -------------- M b + a -------------- -------------- @@ -430,6 +434,7 @@ (branch merge, don't forget to commit) -------------- M b + a -------------- -------------- @@ -452,6 +457,7 @@ (branch merge, don't forget to commit) -------------- M b + a M c --------------