Show More
@@ -176,6 +176,7 b' def concludenode(repo, rev, p1, p2, stat' | |||||
176 | user=repo[rev].user(), |
|
176 | user=repo[rev].user(), | |
177 | date=repo[rev].date(), |
|
177 | date=repo[rev].date(), | |
178 | extra=extra) |
|
178 | extra=extra) | |
|
179 | repo.dirstate.setbranch(repo[newrev].branch()) | |||
179 | return newrev |
|
180 | return newrev | |
180 | except util.Abort: |
|
181 | except util.Abort: | |
181 | # Invalidate the previous setparents |
|
182 | # Invalidate the previous setparents |
@@ -28,3 +28,5 b" echo '% Rebase a branch while preserving" | |||||
28 | hg update -C 3 |
|
28 | hg update -C 3 | |
29 | hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
29 | hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
30 | hg glog --template '{rev}:{desc}:{branches}\n' |
|
30 | hg glog --template '{rev}:{desc}:{branches}\n' | |
|
31 | echo '% dirstate branch should be "notdefault"' | |||
|
32 | hg branch |
General Comments 0
You need to be logged in to leave comments.
Login now