changeset 36928 | 9457c395fcbb |
parent 36927 | 17a744c5e270 |
child 36929 | cc2bfc7d5362 |
--- a/hgext/rebase.py Fri Mar 09 10:35:48 2018 -0800 +++ b/hgext/rebase.py Thu Mar 08 14:17:24 2018 -0800 @@ -579,6 +579,12 @@ editor=editor, keepbranches=self.keepbranchesf, date=self.date) + + if newnode is None: + # If it ended up being a no-op commit, then the normal + # merge state clean-up path doesn't happen, so do it + # here. Fix issue5494 + mergemod.mergestate.clean(repo) if newnode is not None: newrev = repo[newnode].rev() for oldrev in self.state: