Skip to content
Snippets Groups Projects
Commit b9daa5b7a3af authored by Stefano Tortarolo's avatar Stefano Tortarolo
Browse files

rebase: block collapse with keepbranches on multiple named branches (issue2112)

Collapse and keepbranches should be blocked when there is more than
one named branch on the branch that's going to be rebased.
parent d2d592718e90
No related branches found
No related tags found
No related merge requests found
......@@ -175,6 +175,14 @@
assert not extrafn, 'cannot use both keepbranches and extrafn'
def extrafn(ctx, extra):
extra['branch'] = ctx.branch()
if collapsef:
branches = set()
for rev in state:
branches.add(repo[rev].branch())
if len(branches) > 1:
raise util.Abort(_('cannot collapse multiple named '
'branches'))
# Rebase
if not targetancestors:
......
......@@ -442,3 +442,41 @@
D
F
Interactions between collapse and keepbranches
$ cd ..
$ hg init e
$ cd e
$ echo 'a' > a
$ hg ci -Am 'A'
adding a
$ hg branch '1'
marked working directory as branch 1
$ echo 'b' > b
$ hg ci -Am 'B'
adding b
$ hg branch '2'
marked working directory as branch 2
$ echo 'c' > c
$ hg ci -Am 'C'
adding c
$ hg up -q 0
$ echo 'd' > d
$ hg ci -Am 'D'
adding d
$ hg tglog
@ 3: 'D'
|
| o 2: 'C' 2
| |
| o 1: 'B' 1
|/
o 0: 'A'
$ hg rebase --keepbranches --collapse -s 1 -d 3
abort: cannot collapse multiple named branches
[255]
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