Mercurial > hg

changeset 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 ea82a23cf887
children faa318261ee8 3477ad0b1f2c
files hgext/rebase.py tests/test-rebase-keep-branch tests/test-rebase-keep-branch.out
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
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
--- a/tests/test-rebase-keep-branch	Wed Apr 29 09:30:28 2009 +0200
+++ b/tests/test-rebase-keep-branch	Fri May 01 12:26:37 2009 +0200
@@ -28,3 +28,5 @@
 hg update -C 3
 hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 hg glog --template '{rev}:{desc}:{branches}\n'
+echo '% dirstate branch should be "notdefault"'
+hg branch
--- a/tests/test-rebase-keep-branch.out	Wed Apr 29 09:30:28 2009 +0200
+++ b/tests/test-rebase-keep-branch.out	Fri May 01 12:26:37 2009 +0200
@@ -31,3 +31,5 @@
 |
 o  0:c1:
 
+% dirstate branch should be "notdefault"
+notdefault