Combining repos

[Steve Greenland]

According to Daniel Holth <dholth at fastmail.fm>:
> > On Thursday, 21 June 2007 at 19:04, Steve Greenland wrote:
> >> Is there any way to convert an existing mercurial repo to be a
> >> subdirectory of newer repo?
> >> [*snip*]
> >> Hmmm, it looks like the transplant extension might work, with a filter.
> >> Any comments/confirmation?
> >
> > I've used it for that myself. But it probably won't do the right thing
> > if the repo you're importing (the subdir) has merges.

No merges, but it appears from the docs (i.e. I haven't actually
tried it) than the resulting repo requires the transplant extension
for correct behavior in the future, correct? (Based on the last two
paragraphs of the "Overview" section on the wiki page.)


> Haven't you heard of the coolest merge ever?
> 
> Just use "hg mv" to move everything in the old repository into the
> desired subdirectory name, "cd new ; hg pull -f old"; "hg merge". The
> combined repository will have two root revisions.

Nifty. Given "log = --follow" in my .hgrc (and a quick upgrade to 0.93),
that works fine. Thanks.

Steve
-- 
Steve Greenland
    The irony is that Bill Gates claims to be making a stable operating
    system and Linus Torvalds claims to be trying to take over the
    world.       -- seen on the net