Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-merge1.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 | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
5029:ac97e065cfc7 | 5045:f191bc3916f7 |
---|---|
5 overwrite None partial False | 5 overwrite None partial False |
6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 | 6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 |
7 a2: divergent renames -> dr | 7 a2: divergent renames -> dr |
8 a: remote moved to b -> m | 8 a: remote moved to b -> m |
9 b2: remote created -> g | 9 b2: remote created -> g |
10 copying a to b | |
10 merging a and b | 11 merging a and b |
11 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c | 12 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
12 copying a to b | |
13 removing a | 13 removing a |
14 warning: detected divergent renames of a2 to: | 14 warning: detected divergent renames of a2 to: |
15 c2 | 15 c2 |
16 b2 | 16 b2 |
17 getting b2 | 17 getting b2 |