Nested CVS projects
Steven Hirsch <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
I'm trying to import an application that was structured as a root directory
under CVS control, but containing only the Makefiles and build scripts. To
build the app, users would checkout about 10 subdirectories under that root.
Each of the subdirectories was itself a separate CVS project.
Trying to import from the top is a real disaster in terms of tag and branch
conversion. cvs2svn imputes all tags and branches seen in its recursion to
all files in all directories, then goes back and marks files that had nothing
to do with a particular tag/branch as 'deleted' from that branch. Tree
browsing in, e.g. kdesvn becomes a total mess.
For my second attempt I used a python options file to import each subdirectory
separately, turning off the cross-project and cross-branch commits options.
This gave me what I wanted in terms of the revision tree for all the various
files and the subdirectories. Problem is, I'm unable to import the build
files in the root during the same operation! I made a temporary copy of the
Makefiles:
/tmp/cvsrepos/
project/
Makefile,v
CVSROOT/
and tried to bring this into the 'trunk' directory during batch import such
that the Makefile would be a peer of the various subdirectories (since there's
no way to bound cvs2svn's recursion, I had to fake it out by not having the
subdirectories). The goal was to have the repository be:
svnrepos/
project/
Makefile
subdir1/
subdir2/
...
Unfortunately, it does not like this and complains that the 'project'
directory contains 'subdir1...subdirN' before quitting. Catch-22.
The frustrating part is that if I import the subdirectories _without_ the
Makefile I'm able to add it later manually without any complaints about the
root of the project being occupied! That obviously means I lose all the CVS
history for the Makefile, though.
Is there any way to get cvs2svn to accommodate me? If this isn't making
sense, let me know and I'll try to clarify.
Steve
------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2808224
To unsubscribe from this discussion, e-mail: [[email protected]].