Show More
@@ -375,7 +375,8 b' def concludenode(repo, rev, p1, p2, comm' | |||||
375 | targetphase = max(ctx.phase(), phases.draft) |
|
375 | targetphase = max(ctx.phase(), phases.draft) | |
376 | # retractboundary doesn't overwrite upper phase inherited from parent |
|
376 | # retractboundary doesn't overwrite upper phase inherited from parent | |
377 | newnode = repo[newrev].node() |
|
377 | newnode = repo[newrev].node() | |
378 | phases.retractboundary(repo, targetphase, [newnode]) |
|
378 | if newnode: | |
|
379 | phases.retractboundary(repo, targetphase, [newnode]) | |||
379 | return newrev |
|
380 | return newrev | |
380 | except util.Abort: |
|
381 | except util.Abort: | |
381 | # Invalidate the previous setparents |
|
382 | # Invalidate the previous setparents |
General Comments 0
You need to be logged in to leave comments.
Login now