MultipleHeads query...

[Adrian Buehlmann]

On 02.04.2008 19:09, Doug Philips wrote:

(side note: I had some difficulties with your line wrappings, not sure
why. Your lines didn't seem to end in my mailer - using Mozilla
Thunderbird here)

> On the MultipleHeads wiki page it talks about how convenient it is to
> have all your base in one repo, so that an "update -C" can flip your
> working directory back and forth between various branches. It even
> gives an example of the mainline branch tip being version
> 3.0 and then going back to fix a bug in v1.0 (creating v1.1).
> 
> What it doesn't say is what you might do if you want that very same fix
> to appear in 2.0 and 3.0, etc.

As a side note: If you know Perforce: it has integration records for
this purpose ("p4 integrate" see
http://www.perforce.com/perforce/doc.073/manuals/cmdref/integrate.html#1040699)

A feature which is laking in Subversion, I believe.

An interesting topic in general.

Core Mercurial has hg merge.

None of these being cherry-picking changes though.

Perforce operates on single file revisions, not explicitly recording
the changelist that's in general used as a base for an integration.

Mercurial's focus is on integrating a complete linear sequence
of changesets (an thus implicitly *all* files of a repo) into another
line of development.

A partial merge might be interesting here (we already have other
"partial" discussions, like "PartialCloning"...)

> I'm sure this has been discussed before on the list, most recently under the rubrick of cherry picking.
> Would it be inappropriate to harvest some of that discussion and put it into the MultipleHead's page?

I'm mostly responding to say: It would sure not be inappropriate to
expand MultipleHeads. It would also have been ok to just start editing.

And that wiki page surely can be improved/expanded.

> Is there a better term I should use to search the archives?

Hmm, I don't know. A full text search for "cherry" on the *wiki*
(using http://www.selenic.com/mercurial/wiki/index.cgi/FindPage)
for example returns pages:

TransplantExtension
UsingExtensions
UserSurvey
NewIdeas
CommunicatingChanges
BadContent

(though the last one not being relevant here :)

TransplantExtension

seeming to be most related here.