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

Matt Mackall mpm at selenic.com
Tue Jul 19 16:14:11 CDT 2011


On Tue, 2011-07-19 at 23:05 +0200, Stefano Tortarolo wrote:
> 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...

Ok, non-programmer English typically binds this way:

"x and y should be blocked" -> "x should be blocked and y should be
blocked"

not

"x and y should be blocked" -> "x together with y should be blocked"


I agree that there's no sensible way to preserve multiple branch names
when collapsing to one changeset.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list