Mercurial > hg
diff hgext/rebase.py @ 34092:8a8e7a94ba07
rebase: do not crash rebasing merge with a parent having hidden successor
The added test will crash with previous code.
Differential Revision: https://phab.mercurial-scm.org/D640
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 06 Sep 2017 12:40:00 -0700 |
parents | 79ab5369d55a |
children | 15ec3119d500 |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Sep 06 18:33:55 2017 -0700 +++ b/hgext/rebase.py Wed Sep 06 12:40:00 2017 -0700 @@ -1072,7 +1072,8 @@ The new parents of a merge is slightly more complicated. See the comment block below. """ - cl = repo.changelog + # use unfiltered changelog since successorrevs may return filtered nodes + cl = repo.unfiltered().changelog def isancestor(a, b): # take revision numbers instead of nodes if a == b: