D2759: rebase: fix issue 5494 also with --collapse
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Mar 9 21:09:20 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2759
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-interruptions.t
CHANGE DETAILS
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -479,7 +479,6 @@
$ hg rebase --continue
rebasing 2:fdaca8533b86 "b" (tip)
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
-BROKEN: the merge state was not cleared
$ hg resolve --list
- R a
$ test -d .hg/merge
+ [1]
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list