Re: Merging branches in SVN after converting with cvs2svn
Michael Haggerty <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
Christian Posta wrote: > [...] > I had branches in the CVS project that got converted to SVN branches. > However, now in SVN I cannot merge the branches back to the trunk > without old, extraneous files showing up and causing conflicts. > > Is this a known limitation of the CVS to SVN conversion process? That > branches which were branched outside of SVN (and under CVS) cannot be > merged properly to the trunk? cvs2svn uses the equivalent of an "svn cp" command to branch files that are branched in CVS. Modern versions of Subversion should be able to use this information to figure out which changes on branch still have to be merged back to trunk. Of course, any merging that was done in CVS before the conversion is *not* known to Subversion, because that information is not even recorded in CVS. That's the theory. But I don't merge in Subversion much anymore, so somebody else might be better able to tell how well this works in practice. Michael ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2452030 To unsubscribe from this discussion, e-mail: [[email protected]].