cvs conversion with ConvertExtension - branches/versions in CVS require merging

[Richard Murray]

Hi, 

 

I've attempted to convert our CVS repository to Mercurial using the
ConvertExtension but have a couple of problems with Branches.  I'm using
Mercurial version 1.5.4 (on Windows)

 

-          I ran a cvs checkout (cvs server is on Solaris 10 box)

-          hg convert > hg convert <my-project>

-          cd <my-project>-hg

-          hg update

 

When I check a particular branch it appears to have been split out into a tag
and a branch.  If I compare the contents of the hg branch to the cvs branch a
lot of files were missing.

 

hg branches 

CRM2010A                          404:15e715933561

 

hg tags 

Root_CRM2010A              18620:c8e23ff124fc

 

I merged the tag with the branch as follows and the comparison to the CVS
branch succeeded.

 

hg update CRM2010A

hg merge Root_CRM2010A

hg commit -m "merge"

 

NOTE: I had a lot of merge conflicts that took time to resolve

 

The CVS branch was created using Eclipse.  When creating a branch in Eclipse
it also seems to create a tag with the name Root_<branch-name> (when you type
the branch name, it also auto-complete a 'Version' field for you) .

I thought the Mercurial branch would include all the changes, but it only
appears to include the commit's that were performed since the tag was
created.  I have a lot of branches to migrate so don't want to have to
perform a merge for all of them.

Is there another way to do this?  Before anyone suggests cvs2svn, I'm trying
to get it running but having a nightmare setting it up.

 

Thanks, 

 

Richard.

 

 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100713/ce47fc25/attachment.html>