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

Re: svn does not seem able to merge

From: stephen meechan <mgvk68_at_dsl.pipex.com>
Date: 2004-08-17 22:32:07 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 unix
>style line endings?

Do you by any chance know which version of cvs2svn you used and what
options?

---------------------------------------------------------------------
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:25:36 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.