##// END OF EJS Templates
rebase: do not raise an UnboundLocalError when called wrong (issue4106)...
Simon Heimberg -
r20597:9155257e default
parent child Browse files
Show More
@@ -516,6 +516,12 b' def rebasenode(repo, rev, p1, state, col'
516 if state.get(p.rev()) == repo[p1].rev():
516 if state.get(p.rev()) == repo[p1].rev():
517 base = p.node()
517 base = p.node()
518 break
518 break
519 else: # fallback when base not found
520 base = None
521
522 # Raise because this function is called wrong (see issue 4106)
523 raise AssertionError('no base found to rebase on '
524 '(rebasenode called wrong)')
519 if base is not None:
525 if base is not None:
520 repo.ui.debug(" detach base %d:%s\n" % (repo[base].rev(), repo[base]))
526 repo.ui.debug(" detach base %d:%s\n" % (repo[base].rev(), repo[base]))
521 # When collapsing in-place, the parent is the common ancestor, we
527 # When collapsing in-place, the parent is the common ancestor, we
General Comments 0
You need to be logged in to leave comments. Login now