equal
deleted
inserted
replaced
418 newnode = concludenode(repo, rev, p1, p2, |
418 newnode = concludenode(repo, rev, p1, p2, |
419 extrafn=_makeextrafn(self.extrafns), |
419 extrafn=_makeextrafn(self.extrafns), |
420 editor=editor, |
420 editor=editor, |
421 keepbranches=self.keepbranchesf, |
421 keepbranches=self.keepbranchesf, |
422 date=self.date) |
422 date=self.date) |
|
423 if newnode is None: |
|
424 # If it ended up being a no-op commit, then the normal |
|
425 # merge state clean-up path doesn't happen, so do it |
|
426 # here. Fix issue5494 |
|
427 mergemod.mergestate.clean(repo) |
423 else: |
428 else: |
424 # Skip commit if we are collapsing |
429 # Skip commit if we are collapsing |
425 repo.dirstate.beginparentchange() |
430 repo.dirstate.beginparentchange() |
426 repo.setparents(repo[p1].node()) |
431 repo.setparents(repo[p1].node()) |
427 repo.dirstate.endparentchange() |
432 repo.dirstate.endparentchange() |