Hi Zsolt,
> is there a tool ton convert from subversion to CVS?
In the several years that I've been reading this mailing list, you're
the second person I've seen ask that question, and I have a feeling
the total number of people who want to go from SVN to CVS is not a
whole lot higher. I hate to disappoint you, but you're in a very
lonely crowd. Not only is there not a SVN->CVS tool that I'm aware
of, but I find it unlikely that one will be written unless you do it
yourself.
>
> I have the impression that CVS merges branches better that subversion.
Because CVS has branches as a heavyweight entity instead of the cheap
copies that Subversion uses, CVS -tracks- branch merges better than
Subversion. On the other hand, Subversion does so many other things
better than CVS. If you are concerned about the merge tracking, I
suggest you might want to take a look at svnmerge (http://
www.dellroad.org/svnmerge/index). It is a tool that works on top of
Subversion to provide merge tracking. I can't claim to have actually
used it, but it seems to be very popular and is now available for
download directly from the SVN website.
As far as the actual process of merging goes, SVN actually performs
that much more cleanly than CVS does, especially when conflicts
occur. Instead of just giving you a conflicted file with all of the
conflicts merged in, it also gives you pristine copies of the
original, the version being merged in, and any other versions that
are apropos.
I hope that helps,
Bill Nagel
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 8 16:28:59 2006