Skip to content
Snippets Groups Projects
Commit 609ce91670d0 authored by Patrick Mezard's avatar Patrick Mezard
Browse files

rebase: fix bug where --keepbranches could leave wrong branch in dirstate

Report and original fix by Augie Fackler <durin42@gmail.com>
parent ea82a23cf887
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......@@ -31,3 +31,5 @@
|
o 0:c1:
% dirstate branch should be "notdefault"
notdefault
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment