Patchwork D8290: morestatus: recommend `hg resolve --clear` when appropriate

login
register
mail settings
Submitter phabricator
Date March 13, 2020, 9:21 p.m.
Message ID <differential-rev-PHID-DREV-2esmxmqvz76ua7y5vjh3-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45774/
State New
Headers show

Comments

phabricator - March 13, 2020, 9:21 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8290

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-update-branches.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - March 20, 2020, 12:02 a.m.
This revision now requires changes to proceed.
marmoute added a comment.
marmoute requested changes to this revision.


  This on seems need to be updated with `hg update --continue/hg continue`

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8290/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8290

To: martinvonz, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel

Patch

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -635,6 +635,7 @@ 
   $ hg status
   M foo
   # No unresolved merge conflicts.
+  # Use 'hg resolve --clear' to clear the merge state.
   
   $ hg status -Tjson
   [
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -883,6 +883,10 @@ 
 
         else:
             msg = _(b'No unresolved merge conflicts.')
+            if not self.unfinishedop:
+                msg += _(
+                    b"\nUse 'hg resolve --clear' to clear the merge state."
+                )
 
         fm.plain(b'%s\n' % _commentlines(msg), label=self._label)