CVS conversion options

Hello,

I want two CVS modules 'mod1' and 'mod2' to be merged into one 'pj1'
project, and make every tag they share include both module. So, I've
created add_project() entries in the cvs2svn like the following:
...
run_options.add_project(
  r'/var/cvssrc/mod1',
  trunk_path='pj1/trunk/mod1',
  tags_path='pj1/tags')
run_options.add_project(
  r'/var/cvssrc/mod2',
  trunk_path='pj1/trunk/mod2',
  tags_path='pj1/tags')
...

Now I am getting this error:

...
----- pass 3 (CollateSymbolsPass) -----
Checking for forced tags with commits...
The following paths are not disjoint:
    Path pj1/tags/initial-version is repeated 2 times
Please fix the above errors and restart CollateSymbolsPass
...

I guess that's because you can not merge symbols between different projects.

I could add just one project and specify CVS repository root as source
folder, but there are several tens of modules in this CVS repository,
and the target tags tree will be polluted by tags from other projects.

I could remove unnecessary modules from CVS repository by hand to
avoid extra tags creeping into repository history, but all those other
projects should be converted too into the same SVN repo.

I could convert them one project at a time, but that means I need to
copy CVS root manually for each couple projects that should be merged
together. This will also make history inconsistent when bigger
revision numbers can have a date less than smaller revisions. I would
like to avoid this.

Is there any way to accomplish that I need?

Thanks.

--anatoly t.

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2406876

To unsubscribe from this discussion, e-mail: [[email protected]].