# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-01-19 00:14:55
# Node ID 4b088ae9d47a0b290a9a2faba351b8a54ae608f9
# Parent  23921c17299a1f3b2d0f0c12cc778181a4669fc6

rebase: only advance phase on successful commit

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -375,7 +375,8 @@ def concludenode(repo, rev, p1, p2, comm
         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