Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Mon Oct 18 14:37:52 2010 +0200 +++ b/tests/test-rename-merge1.t Sun Oct 10 09:50:25 2010 -0500 @@ -47,7 +47,7 @@ my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c premerge successful updating: a2 2/3 files (66.67%) - warning: detected divergent renames of a2 to: + note: possible conflict - a2 was renamed multiple times to: c2 b2 updating: b2 3/3 files (100.00%) @@ -95,7 +95,7 @@ $ hg up c761c6948de0 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg up - warning: detected divergent renames of b to: + note: possible conflict - b was renamed multiple times to: b3 b4 2 files updated, 0 files merged, 1 files removed, 0 files unresolved