D346: rebase: only change self.state when collapsing in _finishrebase
quark (Jun Wu)
phabricator at mercurial-scm.org
Mon Aug 21 11:43:59 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG70354bd4f19b: rebase: only change self.state when collapsing in _finishrebase (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D346?vs=780&id=1125
REVISION DETAIL
https://phab.mercurial-scm.org/D346
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -461,12 +461,10 @@
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
- if newnode is None:
- newrev = self.dest
- else:
+ if newnode is not None:
newrev = repo[newnode].rev()
- for oldrev in self.state.iterkeys():
- self.state[oldrev] = newrev
+ for oldrev in self.state.iterkeys():
+ self.state[oldrev] = newrev
if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, **opts)
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list