Patchwork D8000: mq: don't tell user to commit merge that we already committed

login
register
mail settings
Submitter phabricator
Date March 4, 2020, 7:51 p.m.
Message ID <31d1e5d2baa5149987e953df6d70a2eb@localhost.localdomain>
Download mbox | patch
Permalink /patch/45482/
State Not Applicable
Headers show

Comments

phabricator - March 4, 2020, 7:51 p.m.
Closed by commit rHG4152183acedd: mq: don&#039;t tell user to commit merge that we already committed (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8000?vs=19591&id=20487

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

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

AFFECTED FILES
  hgext/mq.py
  tests/test-mq-merge.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers, durin42, pulkit
Cc: mercurial-devel

Patch

diff --git a/tests/test-mq-merge.t b/tests/test-mq-merge.t
--- a/tests/test-mq-merge.t
+++ b/tests/test-mq-merge.t
@@ -132,7 +132,6 @@ 
   patch didn't work out, merging patcha
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
   applying patcha2
   now at: patcha2
 
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -858,7 +858,7 @@ 
         strip(self.ui, repo, [n], update=False, backup=False)
 
         ctx = repo[rev]
-        ret = hg.merge(ctx)
+        ret = hg.merge(ctx, remind=False)
         if ret:
             raise error.Abort(_(b"update returned %d") % ret)
         n = newcommit(repo, None, ctx.description(), ctx.user(), force=True)