[PATCH] rebase: block collapse and keepbranches on multiple named branches (issue2112)

[Stefano Tortarolo]

2011/7/19 Matt Mackall <mpm at selenic.com>

> On Mon, 2011-07-18 at 22:58 +0200, Stefano Tortarolo wrote:
> > # HG changeset patch
> > # User Stefano Tortarolo <stefano.tortarolo at gmail.com>
> > # Date 1311022701 -7200
> > # Node ID b9fff4df56509c1c3c7f714f30041057b97c9877
> > # Parent  647071c6dfcfc19a4dedb37c1e4c0b60378d953b
> > rebase: block collapse and 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.
>
> Why can't keepbranches work with more than one branch name?
>
>
keepbranches can work with more than one branch name.
It's the interaction between keepbranches and collapse that's tricky...

Let's say we have:
a - b - c (branch1) - d (branch2)
      \
       e

Then we try to do: rebase --keepbranches --collapse -s c -d e and we end up
with:
a - b - e - c' d' (branchX?)

which branch should we use for rev(c' d')?

Obviously, this is not a problem with collapse alone, since rev(c' d')'s
branch would be the same of rev(e).

Stefano
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110719/49f26d66/attachment.html>