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.
mq: don't tell user to commit merge that we already committed
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 24 Jan 2020 15:51:19 -0800
changeset 44435 4152183acedd
parent 44434 2f290136b7d6
child 44436 09f3e003fc2a
mq: don't tell user to commit merge that we already committed Differential Revision: https://phab.mercurial-scm.org/D8000
hgext/mq.py file | annotate | diff | comparison | revisions
tests/test-mq-merge.t file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Fri Jan 24 15:28:37 2020 -0800
+++ b/hgext/mq.py	Fri Jan 24 15:51:19 2020 -0800
@@ -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)
--- a/tests/test-mq-merge.t	Fri Jan 24 15:28:37 2020 -0800
+++ b/tests/test-mq-merge.t	Fri Jan 24 15:51:19 2020 -0800
@@ -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
Mercurial