[PATCH] convert: added cvsnt mergepoint support

[Henrik Stuart]

We have been converting a large repository from CVS to Mercurial that
contains many merges between a large number of branches, and we have
wanted to keep this merge history intact. Our merges do not have a
specific string we can search for using the currently supported features
in the built-in cvsps, so we have added support for reading mergepoint
information from the cvs server, if the rlog messages happen to include
this information (i.e. if we're running cvsnt).

If no mergepoints are available in the rlog from cvs, it just runs the
old algorithm.

-- 
Kind regards,
Henrik Stuart
Edlund A/S
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 8b93e7dfc7facbd6b207fd81ddab05cbfba58e2a.patch
Type: text/x-patch
Size: 3871 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20090324/3525b703/attachment-0002.bin>