torek, 09. oktober 2012

Merge two mercurial repositories into one

This is a summary of a StackOverflow question

cd repo2
mkdir repo2
hg rename * repo2
hg commit -m "Move repo2 files into a subfolder"
cd repo1
hg pull -f path\to\repo2
hg merge
... and deal with merge conflicts if any ...
hg commit -m "Merge with repo2"
Objavite komentar