diff hgext/rebase.py @ 8270:3477ad0b1f2c

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 May 2009 12:35:13 +0200
parents cb08c3765a02 609ce91670d0
children 6d4bf1c1a003
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Apr 30 23:57:36 2009 -0500
+++ b/hgext/rebase.py	Fri May 01 12:35:13 2009 +0200
@@ -176,6 +176,7 @@
                             user=repo[rev].user(),
                             date=repo[rev].date(),
                             extra=extra)
+        repo.dirstate.setbranch(repo[newrev].branch())
         return newrev
     except util.Abort:
         # Invalidate the previous setparents