Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge2.out @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 01 Aug 2007 12:33:12 -0500 |
| parents | 723e0ddb6ada |
| children | 4b6f0aa568e5 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out +++ b/tests/test-rename-merge2.out @@ -6,17 +6,17 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 rev: versions differ -> m a: remote copied to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 -copying a to b merging rev my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -------------- -M a M b a +C a -------------- -------------- @@ -49,9 +49,9 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b rev: versions differ -> m a: remote moved to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 -copying a to b removing a merging rev my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 @@ -357,9 +357,9 @@ resolving manifests ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 rev: versions differ -> m a: remote moved to b -> m +copying a to b merging a and b my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 -copying a to b removing a merging rev my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337