--- 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
--- a/tests/test-rebase-keep-branch Thu Apr 30 23:57:36 2009 -0500
+++ b/tests/test-rebase-keep-branch Fri May 01 12:35:13 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 Thu Apr 30 23:57:36 2009 -0500
+++ b/tests/test-rebase-keep-branch.out Fri May 01 12:35:13 2009 +0200
@@ -31,3 +31,5 @@
|
o 0:c1:
+% dirstate branch should be "notdefault"
+notdefault