Mercurial > hg
changeset 44435:4152183acedd
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 | 09f3e003fc2a |
| files | hgext/mq.py tests/test-mq-merge.t |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
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)
--- 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