equal
deleted
inserted
replaced
546 editor=editor, |
546 editor=editor, |
547 user=ctx.user(), |
547 user=ctx.user(), |
548 date=date, |
548 date=date, |
549 ) |
549 ) |
550 |
550 |
551 if newnode is None: |
|
552 # If it ended up being a no-op commit, then the normal |
|
553 # merge state clean-up path doesn't happen, so do it |
|
554 # here. Fix issue5494 |
|
555 mergemod.mergestate.clean(repo) |
|
556 return newnode |
551 return newnode |
557 |
552 |
558 def _rebasenode(self, tr, rev, allowdivergence, progressfn): |
553 def _rebasenode(self, tr, rev, allowdivergence, progressfn): |
559 repo, ui, opts = self.repo, self.ui, self.opts |
554 repo, ui, opts = self.repo, self.ui, self.opts |
560 dest = self.destmap[rev] |
555 dest = self.destmap[rev] |