Re: Re: svn does not seem able to merge

> > >Nope. One possibility: svn seems to be converting my text files to
> > >unix-style line endings. Our text editor is converting them
> > >back...would this cause a conflict?
> > >
> > >Corollary: is it possible to suppress conversion of text files to
> unix
> > >style line endings?
> >
> > Do you by any chance know which version of cvs2svn you used and what
> > options?
>
> 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.

---------------------------------------------------------------------
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:33:12 2004