Mercurial > hg
diff hgext/rebase.py @ 46027:1d5189a57405 stable 5.6.1
rebase: clear merge state when aborting in-memory merge on dirty working copy
Differential Revision: https://phab.mercurial-scm.org/D9509
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 02 Dec 2020 15:39:01 -0800 |
parents | 5c8230ca37f2 |
children | 2cf61e66c6d0 |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Dec 02 15:15:16 2020 -0800 +++ b/hgext/rebase.py Wed Dec 02 15:39:01 2020 -0800 @@ -638,7 +638,12 @@ b"commit again in the working copy\n" ) ) - cmdutil.bailifchanged(repo) + try: + cmdutil.bailifchanged(repo) + except error.Abort: + clearstatus(repo) + clearcollapsemsg(repo) + raise self.inmemory = False self._assignworkingcopy() mergemod.update(repo[p1], wc=self.wctx)