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

[Pierre-Yves David]

On Mon, Mar 26, 2012 at 10:54:47PM -0700, Steven Stallion wrote:
> # HG changeset patch
> # User Steven Stallion <sstallion at gmail.com>
> # Date 1332827534 25200
> # Node ID 4743d44e9353b643232846cfc12990bc64162573
> # Parent  e53c0b2d7b6081586666579b4d0a2ffdedaac1b8
> transplant: permit merge changesets via --force/-f
> 
> 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.

cheer


-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- 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/20120327/23a84348/attachment.pgp>