47d330de83
This adds a new command line option (--subrepo-map) that will map mercurial subrepos to git submodules. The --subrepo-map takes a mapping file as an argument that will be used to map a subrepo folder to a git submodule. For more information see the README-SUBMODULES.md. This commit is inspired by the changes made by daolis in PR#38 that was never merged. Closes: #51 Closes: #147
1.8 KiB
How to convert Mercurial Repositories with subrepos
Introduction
Subrepositories must first be converted in order for the conversion of the super repository to know how hg commits map to git commits in the sub repositories. When all subrepositories have been converted, a mapping file that maps the mercurial subrepository path to a converted git submodule path must be created. The format for this file is:
""="" ""="" ...
The path of this mapping file is then provided with the --subrepo-map command line option.
Example
Example mercurial repo folder structure (~/mercurial): src/... subrepo/subrepo1 subrepo/subrepo2
Setup
Create an empty new folder where all the converted git modules will be imported: mkdir ~/imported-gits cd ~/imported-gits
Convert all submodules to git:
mkdir submodule1
cd submodule1
git init
hg-fast-export.sh -r ~/mercurial/subrepo1
cd ..
mkdir submodule2
cd submodule2
git init
hg-fast-export.sh -r ~/mercurial/subrepo2
Create mapping file
cd ~/imported-gits
cat > submodule-mappings << EOF
"subrepo/subrepo1"="../submodule1"
"subrepo/subrepo2"="../submodule2"
EOF
Convert main repository
cd ~/imported-gits
mkdir git-main-repo
cd git-main-repo
git init
hg-fast-export.sh -r ~/mercurial --subrepo-map=../submodule-mappings
Result
The resulting repository will now contain the subrepo/subrepo1 and subrepo/subrepo1 submodules. The created .gitmodules file will look like:
[submodule "subrepo/subrepo1"]
path = subrepo/subrepo1
url = ../submodule1
[submodule "subrepo/subrepo2"]
path = subrepo/subrepo2
url = ../submodule2