Backout of a backout and merge

[Pierre-Yves David]

On Sat, Dec 03, 2011 at 10:33:53PM +0100, Jilles Tjoelker wrote:

> To avoid this problem (and reduce conflicts), be careful with
> transplanting changes between branches that will be merged later (no
> matter whether this is using the transplant extension, manually or any
> other way).

Note than "graft" is core remplacement for the transplant extension is avaible
since 2.0. It's main advantage is to use internal merge machinery.

-- 
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://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111205/6898f1b7/attachment.asc>