[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Re: svn does not seem able to merge

From: Merlin Moncure <merlin.moncure_at_rcsonline.com>
Date: 2004-08-17 22:56:07 CEST

> cvs2svn depends on Python 2.0 -- we had a regression where 2.2 was
> required, but that has been fixed. Please check out our 1.0.0 release
> candidate and try to convert your repository with that:
>
> http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976
>
> > I'm not sure if the converter switched all my eols or the repository
is
> > doing it. If it was the converter (and this is causing my conflict
> > problem), I imagine the problem would eventually work itself out.
If
> > it's the repository, I have a serious problem.
>
> I suspect your conversion was borked. Try cvs2svn... it's nice!

I just confirmed it's a line ending issue. And yes, it was refinecvs
that did it to me. :) Unfortunately we have a high activity repository
and once the decision to go to svn was made I had a single weekend to
get it up. I wish I had taken the time to get cvs2svn working :(

Quite a bit has been done since the original conversion. Not a big
deal, now that I know what I'm dealing with. This is a big load off my
mind.

Thanks to all for the info.

Merlin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 22:56:41 2004

This is an archived mail posted to the Subversion Users mailing list.