On 11/27/2005 5:55 AM, 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.
This isn't much help, but I've found that Windows programs aimed at
developers tend to be more flexible than Unix ones in this regard, so I
do all my development using Unix conventions, even though I work mainly
on Windows.
I haven't noticed that the conflict markers are messed up, but maybe
it's just that my editor (textpad) can cope with the problems.
Duncan Murdoch
>
> 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)
>
> Kees.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
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:28:50 2005