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

RE: Re: svn does not seem able to merge

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

> >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
> >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? :)


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:28:25 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.