Back before I properly knew how to use mercurial, is "branched" development on a solid state of code to create a new version. My way of doing this was to a directory copy of the directory:
Code:
$> cp -r ./hg-src ./hg-src-2.0
I've been working on 2.0 for a while, doing major code changes, etc. In the mean time, 1.0 had bugs that needed repairing. It was around this time I realize that I probably wasn't doing this right. So my hg-src structure looks something like this:
Code:
./hg-src/
.hg/
branches/
1.1/
.hg/
somefile.php
somefile2.php
added_file2.php
tags/
1.0/
somefile.php
somefile2.php
trunk/
somefile.php
somefile2.php
./hg-src-2.0/
.hg/
somefile.php
somefile2.php
brandnewlibrary.php
binaryfile.jpg
Some history: I didn't put together the "branches, tags, trunk" directory structure until after.
What I'd like to do now is do a merge of hg-src and hg-src-2.0 but when I try, it says that the repository is unrelated.
Now, my guess is that if I do a merge ./hg-src/branches/1.1/ and ./hg-src-2.0/ that it will take.
Is there a way to merge all three of these branches into one directory and keep all of the history?
Thanks!
