[SVN-3078] Problem with CRLF handling during diff/merge

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Duplicate
• Affects Version/s: 1.4.x
• Fix Version/s: ---
• Component/s: unknown

Environment

Windows XP

• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 21/Jan/08 12:08
• Updated: 27/Oct/18 16:35
• Resolved: 26/Dec/08 23:28

Description

Hello,

my setup here is as follows:

svnserver on a Linux Debian machine version 1.4.4
Clients running Windows svn 1.4.6

The problem is as follows:

I have checked in files with CRLF (DOS Style) - when I now do a:

svn diff -r 5024:5032 svn://host/repos/path

then svn will output a change on the complete file - where it seems that the
older revision "lines with -" has LF as EOL and the newer revision (with + in
diff file) has correct CRLF.
The result is that a merge is also always conflicted :(

But both revisions are with CRLF within the repository.

Using svn diff -x --ignore-eol-style -r 5024:5032 svn://host/repos/path
shows up with the correct diff. But this is not very helpful, because its not
possible to set this parameter for example in tortoisesvn and other clients.

To me it looks like always the older revision is internally checked out with LF
for the diff.

Please fix as soon as possible - its a very important issue here at my site.

Original issue reported by powerstat

Issue Links

• duplicates: SVN-3262 svn: File '/tmp/tmp' has inconsistent newlines preventing merge from completing