Mercurial > hg-stable

diff hgext/rebase.py @ 15923:4b088ae9d47a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: only advance phase on successful commit
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jan 2012 18:14:55 -0600
parents e66084ef8449
children cd42f77d30c4
line wrap: on
line diff
--- 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