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

Re: line-endings of conflict-markers.

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-11-27 14:54:24 CET

On Nov 27, 2005, at 11:55, Kees Kuip wrote:

> We decided to adapt microsoft line-endings (CR-LF) throughout our
> whole sourcecode. We develop on linux and on windows and now we are
> able to copy svn-directories between the 2 operating systems.
> But now I have a problem on linux. If svn decides that there is a
> merge-confict it inserts conflict-markers (>>>>>, <<<<<<). But
> these conflict markers have line endings from the native system. So
> in case of linux the line-endings are LF. These files with mixed
> line endings are difficult to edit! vim for instance assumes that
> if there is only one line that ends with LF that the fileformat
> must be unix. And then I have the ^M problem (CR is shown as ^M).
> If I then save it I have CR-LF-LF in my file.

It has already been submitted.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 27 14:56:10 2005

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.