Mercurial > hg-stable

diff hgext/rebase.py @ 8266:609ce91670d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix bug where --keepbranches could leave wrong branch in dirstate Report and original fix by Augie Fackler <durin42@gmail.com>
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 May 2009 12:26:37 +0200
parents aee8455ee8ec
children 3477ad0b1f2c
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Apr 29 09:30:28 2009 +0200
+++ b/hgext/rebase.py	Fri May 01 12:26:37 2009 +0200
@@ -172,6 +172,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