CODEWITHSUNDEEP
mercurialsubrepos
Regent
Regent

Reputation: 5602

Join multiple subrepos into one and preserve history in Mercurial

Currently I have project consisting of multiple repositories, e.g.:

+---Project (main repo)
    +---Core (subrepo)
    +---Web (subrepo)
    \---Tests (subrepo)

Unfortunately the code between subrepos is quite coupled so it doesn't work nicely with branches.

Is there any way to consolidate the subrepos into one main repository preserving the history?

Upvotes: 11

Views: 2535

Answers (3)

yanjost
yanjost

Reputation: 5441

First guess : Perhaps by using the convert extension with a filemap ?

Another try :

  • Pull all your repos into the same repo, you will have different heads for the "default" branch
  • Then for each head
    • Update to this head
    • Move the files (hg move) into the right directory
  • Merge all the "default" heads together

Edit : added more details, and another try

Upvotes: 3

Klaim
Klaim

Reputation: 69742

Assuming you don't have to convert repos, why not simply push each repo in the central one?

  1. Make sure each repo root directory have a main directory named after the repo name.
  2. push each repo in the main repo.

Upvotes: 0

Niall C.
Niall C.

Reputation: 10918

I would start with using hg convert with a filemap that excludes the .hgsub and the subrepos. Next, use hg convert on the subrepos with rename entries in the filemap like: rename . Core

Once you have those new repos, you can use hg pull -f to import the changesets from the converted subrepos into the converted main repo one at a time. You'll also need to merge them into your new main repo (they form separate heads with the null revision as the most recent common ancestor).

Upvotes: 8

Related Questions