Mercurial Mercurial > hg / 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.
merge: hint about using `hg resolve` for resolving conflicts
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 21 Aug 2019 13:14:39 -0700
changeset 42804 7b80ad5af239
parent 42803 8ab1ae7f1cf4
child 42806 50e25f30da9c
merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-rebase-inmemory.t file | annotate | diff | comparison | revisions
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Sat Aug 17 18:28:55 2019 +0900
+++ b/mercurial/merge.py	Wed Aug 21 13:14:39 2019 -0700
@@ -2025,7 +2025,8 @@
                 raise error.Abort(_("outstanding uncommitted merge"))
             ms = mergestate.read(repo)
             if list(ms.unresolved()):
-                raise error.Abort(_("outstanding merge conflicts"))
+                raise error.Abort(_("outstanding merge conflicts"),
+                                  hint=_("use 'hg resolve' to resolve"))
         if branchmerge:
             if pas == [p2]:
                 raise error.Abort(_("merging with a working directory ancestor"
--- a/tests/test-rebase-inmemory.t	Sat Aug 17 18:28:55 2019 +0900
+++ b/tests/test-rebase-inmemory.t	Wed Aug 21 13:14:39 2019 -0700
@@ -506,6 +506,7 @@
   $ hg rebase -s 2 -d 7
   rebasing 2:177f92b77385 "c"
   abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
   [255]
   $ hg resolve -l
   U e
--- a/tests/test-resolve.t	Sat Aug 17 18:28:55 2019 +0900
+++ b/tests/test-resolve.t	Wed Aug 21 13:14:39 2019 -0700
@@ -210,12 +210,15 @@
   [1]
   $ hg up 0
   abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
   [255]
   $ hg merge 2
   abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
   [255]
   $ hg merge --force 2
   abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
   [255]
 
 set up conflict-free merge
Mercurial