changeset 46025 | 61c1f29e7f4f |
parent 45957 | 89a2afe31e82 |
child 46034 | 2cf61e66c6d0 |
--- a/hgext/rebase.py Wed Dec 02 15:15:16 2020 -0800 +++ b/hgext/rebase.py Wed Dec 02 15:39:01 2020 -0800 @@ -642,7 +642,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)