All geek questions in one place

Does SVN Update add ^ M in conflicts?

We worked on some files at the same time. Sometimes, when we "svn up", we will see files with "^ M" added to each line of certain files. We initially blamed each other for the editors> _>.

We have since narrowed it to "svn up" when conflicts exist. If we isolate the conflicting file and svn does not show "^ M". In "svn log / diff" does not appear "^ M". This is totally strange, right?

I wanted someone to see this before and know a workaround. IDK, it may not play when setting up another user. We use Subversion 1.4.4 if this helps.

Thanks for reading and I appreciate any comments.

+3
source share
2 answers

This happens to me when:

  • I am using Subversion on Windows
  • I am using vim

When Subversion adds conflict markers (on Windows), it adds them to the ends of the CRLF lines, regardless of whether the rest of the file is just the end of the LF line. When I load a conflicting file into Vim, it cannot automatically determine the line ending style, so it assumes only LF and shows "^ M" at the end of each line with a highlighted conflict. I will definitely edit any of them (therefore, in this example, my file has all the ends of the LF line).

+2
source

, ?

, , - svn: eol-style native .

+2

Source: https://habr.com/ru/post/1717293/

More articles:


All Articles