[RFC] New core command: graft

Matt Mackall mpm at selenic.com
Mon Oct 10 10:58:56 CDT 2011


On Mon, 2011-10-10 at 06:56 +0200, Arne Babenhauserheide wrote:
> Am Sonntag, 9. Oktober 2011, 17:23:38 schrieb Matt Mackall:
> > The basic concept is similar to transplant, except:
> > 
> > - it uses real 3-way merge logic rather than patching
> > - it doesn't work between different repositories
> 
> Does it work when I pulled changesets from an unrelated repository (with --
> force)?

Yes.

> Does it work correctly when I later merge the branch from which I grafted 
> changesets? 

Yes, because the result will generally be identical to import + export

> Otherwise, I like the idea but don’t grok the name. I can’t see me remerbering 
> the name graft to copy changesets… 

Well the choices I'm aware of:

cherry-pick - cherry-pick originally implied various merge/DAG magic
that no one can make good on (though maybe I'm the only one who
remembers this) and isn't an especially good name
transplant - taken locally
integrate (p4) - yuck
backport - implies things about workflow

But here's the common English usage of graft, which I think you'll agree
is apt:

https://secure.wikimedia.org/wikipedia/en/wiki/Grafting
https://secure.wikimedia.org/wikipedia/en/wiki/Medical_grafting

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list