Bug 2112 - rebase --collapse with --keepbranches and multiple branches it not well defined
Summary: rebase --collapse with --keepbranches and multiple branches it not well defined
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: All All
: normal bug
Assignee: Stefano Tortarolo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-23 16:15 UTC by Patrick Mézard
Modified: 2011-07-19 17:00 UTC (History)
4 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Patrick Mézard 2010-03-23 16:15 UTC
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.
Comment 1 Stefano Tortarolo 2011-07-18 15:01 UTC
In my opinion there's nothing more we can do with multiple named branches.
I've sent a patch that's basically what Greg did more than one year ago 
(!!!).
Maybe we should move this discussion in ML, but I'm for disallowing it.
Comment 2 HG Bot 2011-07-19 17:00 UTC
Fixed by http://selenic.com/repo/hg/rev/b9daa5b7a3af
Stefano Tortarolo <stefano.tortarolo@gmail.com>
rebase: block collapse with keepbranches on multiple named branches (issue2112)

(please test the fix)
Comment 3 Bugzilla 2012-05-12 09:07 UTC

--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:07 EDT  ---

This bug was previously known as _bug_ 2112 at http://mercurial.selenic.com/bts/issue2112