Mercurial > hg
comparison tests/test-rename-merge1.t @ 20945:18adc15635a1
merge: keep destination filename as key in filemerge actions
Gives more readable debug output and makes it possible to compare/merge actions
later.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Mar 2014 18:52:16 +0100 |
| parents | e2dc5397bc82 |
| children | e741972017d9 |
comparison
equal
deleted
inserted
replaced
| 20944:5b8d5803d7b7 | 20945:18adc15635a1 |
|---|---|
| 34 src: 'a2' -> dst: 'c2' ! | 34 src: 'a2' -> dst: 'c2' ! |
| 35 checking for directory renames | 35 checking for directory renames |
| 36 resolving manifests | 36 resolving manifests |
| 37 branchmerge: True, force: False, partial: False | 37 branchmerge: True, force: False, partial: False |
| 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
| 39 a: remote moved to b -> m | 39 a2: divergent renames -> dr |
| 40 b: remote moved from a -> m | |
| 40 preserving a for resolve of b | 41 preserving a for resolve of b |
| 41 a2: divergent renames -> dr | |
| 42 b2: remote created -> g | 42 b2: remote created -> g |
| 43 removing a | 43 removing a |
| 44 getting b2 | 44 getting b2 |
| 45 updating: b2 1/3 files (33.33%) | 45 updating: b2 1/3 files (33.33%) |
| 46 updating: a 2/3 files (66.67%) | 46 updating: a2 2/3 files (66.67%) |
| 47 note: possible conflict - a2 was renamed multiple times to: | |
| 48 c2 | |
| 49 b2 | |
| 50 updating: b 3/3 files (100.00%) | |
| 47 picked tool 'internal:merge' for b (binary False symlink False) | 51 picked tool 'internal:merge' for b (binary False symlink False) |
| 48 merging a and b to b | 52 merging a and b to b |
| 49 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | 53 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
| 50 premerge successful | 54 premerge successful |
| 51 updating: a2 3/3 files (100.00%) | |
| 52 note: possible conflict - a2 was renamed multiple times to: | |
| 53 c2 | |
| 54 b2 | |
| 55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 56 (branch merge, don't forget to commit) | 56 (branch merge, don't forget to commit) |
| 57 | 57 |
| 58 $ hg status -AC | 58 $ hg status -AC |
| 59 M b | 59 M b |