Mercurial > hg
comparison tests/test-rename-merge1.t @ 12757:62c8f7691bc3
merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
Before:
$ hg up deadbeef
warning: detected divergent renames of X to:
...
After:
$ hg up deadbeef
note: possible conflict - X was renamed multiple times to:
...
No functionality change.
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Sun, 10 Oct 2010 09:50:25 -0500 |
parents | ada47c38f4e5 |
children | d100702326d5 |
comparison
equal
deleted
inserted
replaced
12756:13f0acfa974a | 12757:62c8f7691bc3 |
---|---|
45 picked tool 'internal:merge' for b (binary False symlink False) | 45 picked tool 'internal:merge' for b (binary False symlink False) |
46 merging a and b to b | 46 merging a and b to b |
47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | 47 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
48 premerge successful | 48 premerge successful |
49 updating: a2 2/3 files (66.67%) | 49 updating: a2 2/3 files (66.67%) |
50 warning: detected divergent renames of a2 to: | 50 note: possible conflict - a2 was renamed multiple times to: |
51 c2 | 51 c2 |
52 b2 | 52 b2 |
53 updating: b2 3/3 files (100.00%) | 53 updating: b2 3/3 files (100.00%) |
54 getting b2 | 54 getting 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 |
93 $ hg mv b b4 | 93 $ hg mv b b4 |
94 $ hg ci -A -m 'divergent renames in same changeset' | 94 $ hg ci -A -m 'divergent renames in same changeset' |
95 $ hg up c761c6948de0 | 95 $ hg up c761c6948de0 |
96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
97 $ hg up | 97 $ hg up |
98 warning: detected divergent renames of b to: | 98 note: possible conflict - b was renamed multiple times to: |
99 b3 | 99 b3 |
100 b4 | 100 b4 |
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |