Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence: actually use the hint that have been around for age
authorPierre-Yves David <pierre-yves.david@fb.com>
Wed, 06 Aug 2014 16:55:41 -0700
changeset 1016 facb5efa8ea4
parent 1015 68d9c7e4a03d
child 1017 186b72e41294
divergence: actually use the hint that have been around for age Having a hint in the code is good, having it displayed is usually seens as better.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Wed Aug 06 16:07:53 2014 -0700
+++ b/hgext/evolve.py	Wed Aug 06 16:55:41 2014 -0700
@@ -1503,7 +1503,7 @@
                 "| You should contact your local evolution Guru for help.\n"
                 % (divergent, othersstr))
         raise util.Abort("we do not handle divergence with split yet",
-                         hint='')
+                         hint=hint)
     other = others[0]
     if divergent.phase() <= phases.public:
         raise util.Abort("we can't resolve this conflict from the public side",
evolve