changeset 15923 | 4b088ae9d47a |
parent 15917 | e66084ef8449 |
child 15945 | cd42f77d30c4 |
--- a/hgext/rebase.py Wed Jan 18 17:23:54 2012 +0100 +++ b/hgext/rebase.py Wed Jan 18 18:14:55 2012 -0600 @@ -375,7 +375,8 @@ targetphase = max(ctx.phase(), phases.draft) # retractboundary doesn't overwrite upper phase inherited from parent newnode = repo[newrev].node() - phases.retractboundary(repo, targetphase, [newnode]) + if newnode: + phases.retractboundary(repo, targetphase, [newnode]) return newrev except util.Abort: # Invalidate the previous setparents