RE: CVS to SVN branch migration issue

> > 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.
> 
> Presumably this is only a problem for branches that were still unmerged
> at the time of the cvs2svn conversion, right?  Because if you are just
> trying to add SVN merge metadata to merges that have already been done
> in CVS, all you have to do is "svn merge --record-only ..." and
> Subversion won't change anything on trunk.
> 

The mergeinfo is a feature we have not yet attempted to exploit, but at some point we will.

> So yes, if you have unmerged branches at the time of the conversion,
> then you will have a problem.  You could solve it either by:
> 
> 1. merging only the modified files back to trunk.  In this case you
> will
> probably be producing a lot of subtree svn:mergeinfo that you will have
> to schlepp with you throughout eternity.
> 
> 2. copy the files that were originally unbranched onto the branch
> before
> the merge.  This would effectively undo the delete.  I'm not exactly
> sure what effect this would have on your svn:mergeinfo; the result
> might
> or might not be cleaner than when using the other approach.
> 

I believe for these branches that were created in CVS, we will be doing a file by file merge back to the trunk in SVN.
But moving forward, branches created in SVN will contain the same file set as the trunk.

> > Is there anyway to head off this issue by getting cvs2svn to not exhibit
> > this behavior during the dump?
> 
> I think it would require some significant programming.
> 
> > (Is this part of the CVS to SVN paradigm shift I have not grasped yet?)
> 
> I think the moral of the story is that partial-tree branching and
> tagging are evil, even though CVS and Subversion nominally support
> them.

I think partial-tree tagging will continue to be a nessesary evil for us.
We use it to help identify the sub-set of files that are released to various environments (and when they were released).
Maybe at some point we can use the properties to help communicate this information more efficiently.

Thanks for your input and guidance.

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

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