CVS to SVN branch migration issue
"Fisher, Randall" <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
I've been using cvs2svn to create a TEST SVN repository to get a feel for how our existing policies, procedures, and practices will change. I've noticed one interesting behavior in cvs2svn that I believe stems from how we have been using CVS. Let me start with some background. We have a CVS repository with separate folders that contain PL/SQL (Oracle) code, DDL scripts, DML scripts, views, and triggers. These artifact sets differ from a Java or C project. This is a series of flat floders with all the artifacts in it and not an entire folder structure with a set of artifacts needed for building a project. For any given change request or development effort, we currently create a branch, in CVS, where we alter the artifacts as needed. Those artifacts that change, and only those that change, get commited to that branch. At some point these are merged down to the trunk, but that goes without saying. So now when I use cvs2svn, it keeps track of all the artifacts that reside on the trunk and it keeps track of the smaller set of artifacts that changed and reside on the branches. Now here is the problem. It also is recording a delete (Node-action: delete) for the artifacts that reside on the trunk and not on the branch. (ie. not altered and never commited on the branch) This becomes a problem when we try merge a branch into the trunk in SVN, as it is also pulling in all the deletes with it. The only work around I can see is to merge the artifacts in one at a time. Is there anyway to head off this issue by getting cvs2svn to not exhibit this behavior during the dump? (Is this part of the CVS to SVN paradigm shift I have not grasped yet?) Randall Fisher Application Developer Navicure, Inc. 2055 Sugarloaf Circle Suite 600 Duluth, GA 30097 770-342-0207 [email protected]<mailto:[email protected]> www.navicure.com<http://www.navicure.com> ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2936151 To unsubscribe from this discussion, e-mail: [[email protected]].