Multiple parents must be specified in the splicemap file to document how
merges were done in the source repo to continue to be able to do merges in
the new hg repo.
The order of the parents in the splicemap file is important; yet no error is
generated if the order is wrong, and the order is not documented anywhere.
The order required is to specify the parent from the same branch first,
followed by the parent from the branch that was merged in. For example:
svn:[...]/trunk@200 svn:[...]/trunk@196,svn:[...]/branches/release_1.0@199
Without this being documented, this is somewhat counterintuitive as it seems
more natural to specify the revs in decreasing numerical order. So it seems
likely that users (like me) will get it wrong -- especially as no error or
warning is generated in that case.
|