Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5029:ac97e065cfc7 | 5045:f191bc3916f7 |
|---|---|
| 4 resolving manifests | 4 resolving manifests |
| 5 overwrite None partial False | 5 overwrite None partial False |
| 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 |
| 7 rev: versions differ -> m | 7 rev: versions differ -> m |
| 8 a: remote copied to b -> m | 8 a: remote copied to b -> m |
| 9 copying a to b | |
| 9 merging a and b | 10 merging a and b |
| 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 | 11 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
| 11 copying a to b | |
| 12 merging rev | 12 merging rev |
| 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 | 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
| 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 15 (branch merge, don't forget to commit) | 15 (branch merge, don't forget to commit) |
| 16 -------------- | 16 -------------- |
| 17 M a | 17 M b |
| 18 M b | 18 a |
| 19 a | 19 C a |
| 20 -------------- | 20 -------------- |
| 21 | 21 |
| 22 -------------- | 22 -------------- |
| 23 test L:nc a b R:up a W: - 2 get rem change to a and b | 23 test L:nc a b R:up a W: - 2 get rem change to a and b |
| 24 -------------- | 24 -------------- |
| 47 resolving manifests | 47 resolving manifests |
| 48 overwrite None partial False | 48 overwrite None partial False |
| 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b |
| 50 rev: versions differ -> m | 50 rev: versions differ -> m |
| 51 a: remote moved to b -> m | 51 a: remote moved to b -> m |
| 52 copying a to b | |
| 52 merging a and b | 53 merging a and b |
| 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 | 54 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
| 54 copying a to b | |
| 55 removing a | 55 removing a |
| 56 merging rev | 56 merging rev |
| 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 | 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
| 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 59 (branch merge, don't forget to commit) | 59 (branch merge, don't forget to commit) |
| 355 resolving manifests | 355 resolving manifests |
| 356 overwrite None partial False | 356 overwrite None partial False |
| 357 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | 357 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 |
| 358 rev: versions differ -> m | 358 rev: versions differ -> m |
| 359 a: remote moved to b -> m | 359 a: remote moved to b -> m |
| 360 copying a to b | |
| 360 merging a and b | 361 merging a and b |
| 361 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 | 362 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
| 362 copying a to b | |
| 363 removing a | 363 removing a |
| 364 merging rev | 364 merging rev |
| 365 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | 365 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
| 366 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 366 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
| 367 (branch merge, don't forget to commit) | 367 (branch merge, don't forget to commit) |