Mercurial > public > mercurial-scm > hg

diff tests/test-issue1175.t @ 12757:62c8f7691bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b63f6422d2a7
children 76b69cccb07a 5b7175377bab
line wrap: on
line diff
--- a/tests/test-issue1175.t	Mon Oct 18 14:37:52 2010 +0200
+++ b/tests/test-issue1175.t	Sun Oct 10 09:50:25 2010 -0500
@@ -13,7 +13,7 @@
 
   $ hg mv a a2
   $ hg up
-  warning: detected divergent renames of a to:
+  note: possible conflict - a was renamed multiple times to:
    a2
    a1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved