[issue2112] rebase --collapse with --keepbranches and multiple branches it not well defined

Patrick Mézard <bugs@mercurial.selenic.com> at mercurial.selenic.com Patrick Mézard <bugs@mercurial.selenic.com> at mercurial.selenic.com
Tue Mar 23 22:15:10 UTC 2010


New submission from Patrick Mézard <pmezard at gmail.com>:

>From issue2100:

@pmezard: please the patch I posted to mercurial-devel yesterday 
( http://www.selenic.com/pipermail/mercurial-devel/2010-March/019799.html ).  
I added test code that does not merely crash, but tests that --collapse and 
--keepbranches do the right thing together.

Also, the kludgy fix that I posted addresses one concern that I don't see in 
your fix: what if someone tries to rebase --collapse --keepbranch where the 
source changesets are not all on the same named branch?  I think the only 
option there is to abort, because it's not possible to fulfill the user's 
wish.

----------
messages: 12159
nosy: astratto, gward, pmezard
priority: bug
status: unread
title: rebase --collapse with --keepbranches and multiple branches it not well defined
topic: rebase

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2112>
____________________________________________________


More information about the Mercurial-devel mailing list