Mercurial > hg-stable

diff hgext/mq.py @ 44455:4152183acedd

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 Differential Revision: https://phab.mercurial-scm.org/D8000
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 15:51:19 -0800
parents 2f290136b7d6
children 9d2b2df2c2ba
line wrap: on
line diff
--- 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)