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

On Tue, 2004-08-17 at 15:37, Merlin Moncure wrote:
> > >
> > > I used the perl one. The options were stock except for warning
> > > suppression and file inclusion...did I err? :)
> >
> > No error, I didn't know there was a perl one... I'm just wrestling
> with a
> > similar problem when using cvs2svn and trying to understand how it's
> > handling the eol properties.
>
> The converter is called refinecvs. I used it because it had a lot less
> dependences than the python one and I never could get the python one
> working (turned out to be an undocumented dependency on 2.2).

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!

:-)

-Fitz

---------------------------------------------------------------------
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:44:13 2004