[PATCH] transplant: permit merge changesets via --force/-f

[Pierre-Yves David]

On Tue, Mar 27, 2012 at 09:21:47AM -0700, Steven Stallion wrote:
> On Tue, Mar 27, 2012 at 2:15 AM, Pierre-Yves David
> <pierre-yves.david at logilab.fr> wrote:
> >> This change permits the transplant extension to operate on merge
> >> changesets by way of --force/-f.  This is particularly useful for
> >> workflows which cherrypick branch merges rather than each commit
> >> within a branch.
> >
> > Graft in a new core command introduced in mercurial 2.0.
> >
> > It does the transplant job but with better merge mechanism (and in core).
> >
> > You might consider patching graft instead.

> graft would be ideal, however we cherrypick between repositories -
> something that graft is not able to do (as far as I know!)

It can if you use an intermediate repository containing history of both repo. It can

    $ hg init both
    $ cd both
    $ hg pull ../first
    $ hg pull --force ../second # mercurial complaint about unrelated repository
    $ hg up some-changeset-of-first
    $ hg graft some-changeset-of-second
    $ hg push -r . ../first # be careful not to push content of "second" in you main "first" repo.

-- 
Pierre-Yves David

http://www.logilab.fr/

ps: My first name is Pierre-Yves

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120328/56ea06fe/attachment.pgp>