Re: Merging branches in SVN after converting with cvs2svn

Michael,

Thanks much for your reply. Your response got me thinking more about how the
branch was created and it occurred to me that the rev number is still stored
in SVN even if the branch metadata wasn't stored properly. Using the rev
numbers themselves (old-school, pre 1.5 method of merging), I am able to do
the correct merge.

Which brought me to realize, the box I converted the CVS repo from had an
*old* version of subversion. It was this old version of subversion that I
relied on to do the CVS - 2 - SVN conversion. The 1.4 version of subversion
didn't handle the branching/merging metadata like the 1.5+ versions do, so
that is why I was getting confusing results. Totally a user error; I should
have been using a newer version of SVN (1.5 or above) and I would not have
seen those merge issues mentioned previously.

Thanks again! The cvs2svn tool is absolutely awesome. And it's really cool
to see that you, et. al., used python to develop it!

Christian

On Thu, Feb 25, 2010 at 5:01 AM, Michael Haggerty <[email protected]>wrote:

> 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=2452104

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