Mercurial > public > mercurial-scm > hg
diff tests/test-rename-merge2.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 | 4c4aeaab2339 |
| children | de793925862e |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Mon Oct 18 14:37:52 2010 +0200 +++ b/tests/test-rename-merge2.t Sun Oct 10 09:50:25 2010 -0500 @@ -383,7 +383,7 @@ c: remote created -> g preserving rev for resolve of rev updating: a 1/3 files (33.33%) - warning: detected divergent renames of a to: + note: possible conflict - a was renamed multiple times to: b c updating: c 2/3 files (66.67%)