Combining history of two branches

[Martin Geisler]

Tom Widmer <tom.widmer at googlemail.com> writes:

> I have two unrelated (in HG terms) repositories:
> X (77MB) has 500 revisions, 4 named branches (all branched after r10)
> Y (466 MB) has 20000 revisions, completely linear history (no branches 
> or merges)
>
> The tip of Y has an *identical* working tree to X at 10.

I would give the the transplant extension a try -- it will move
changesets from one repository to another:

  http://www.selenic.com/mercurial/wiki/index.cgi/TransplantExtension

The idea would be to to Y and transplant 10:tip from X on top of it.

I just tried with a simple test and transplant *didn't* transplant the
merges. There is a --merge flag, but I don't really understand what the
help says about it:

    You can optionally mark selected transplanted changesets as merge
    changesets. You will not be prompted to transplant any ancestors of
    a merged transplant, and you can merge descendants of them normally
    instead of transplanting them.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090505/e4fa75b0/attachment.pgp