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

line-endings of conflict-markers.

From: Kees Kuip <keeskuip_at_xs4all.nl>
Date: 2005-11-27 11:55:30 CET

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.

My request would be that svn inserts conflict-markers which respects the
line-endings of the original document.

Any thoughts on this (before I submit it as a bug)


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 27 12:14:13 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.