Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 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 8b438cb84c57
children 9e7e24052745 c19b9282d3a7
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Oct 18 14:37:52 2010 +0200
+++ b/mercurial/merge.py	Sun Oct 10 09:50:25 2010 -0500
@@ -355,7 +355,8 @@
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
-            repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
+            repo.ui.warn(_("note: possible conflict - %s was renamed "
+                           "multiple times to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec