# HG changeset patch # User Martin von Zweigbergk # Date 1579909879 28800 # Node ID 4152183aceddb48b15467dea90e160d52b6fed17 # Parent 2f290136b7d67dba2e9633d2e24a94d7e024a03c mq: don't tell user to commit merge that we already committed Differential Revision: https://phab.mercurial-scm.org/D8000 diff -r 2f290136b7d6 -r 4152183acedd hgext/mq.py --- 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) diff -r 2f290136b7d6 -r 4152183acedd tests/test-mq-merge.t --- 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