comparison hgext/rebase.py @ 36928:9457c395fcbb

rebase: fix issue 5494 also with --collapse

Differential Revision: https://phab.mercurial-scm.org/D2759

36927:17a744c5e270

                    commitmsg=commitmsg,
                    extrafn=_makeextrafn(self.extrafns),
                    editor=editor,
                    keepbranches=self.keepbranchesf,
                    date=self.date)
            if newnode is not None:
                newrev = repo[newnode].rev()
                for oldrev in self.state:
                    self.state[oldrev] = newrev

36928:9457c395fcbb

                    commitmsg=commitmsg,
                    extrafn=_makeextrafn(self.extrafns),
                    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:
                    self.state[oldrev] = newrev