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

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: 1.5.x
• Fix Version/s: 1.5.5
• Component/s: libsvn_client
• Assignee: Unassigned
• Reporter: Mark Phippard
• Created: 15/Aug/08 23:40
• Updated: 27/Oct/18 16:34
• Resolved: 27/Nov/09 15:55

Description

The original report came in to the merge tracking beta forums.  User has followed up with a 
reproduction so I am filing a bug.  Here is original description, also linked in URL:

I dumped/loaded one of our repositories on our svn1.5 test server and have been playing with it a bit. 
This is one effort to merge a branch back to the trunk - and I don't understand why I'm getting the 
error.

What file is /tmp/tmp? It doesn't exist on the server! And even if the file did exist, why am I getting 
message about inconsistent eol styles when I'm trying to ignore them?

[root]# svn merge -x -w -x --ignore-eol-style http://xxx/svn/cp​-3733/branches/regan​a/logging
--- Merging r3331 through r3774 into '.':
 G build/bin/build-cp.bat
 G build/bin/build-cp.pl
 G Automation/parameters.txt
 G Automation/docs-nightly.txt
 G Automation/BillOfMaterials.txt
 G Automation/win-nightly.txt
A Automation/ToolsBOM.txt
 G Automation/nightly.txt
 G Automation/TestCases​/BAM_XML/demo-bamxml​-parameters.txt
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval001.pl
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval002.pl
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval003.pl
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval004.pl
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval005.pl
 G Automation/TestCases​/BAM_XML/test-LogRet​rieval006.pl
svn: File '/tmp/tmp' has inconsistent newlines
svn: Inconsistent line ending style
svn: Error reading spooled REPORT request response
[root]# ls /tmp/tmp
ls: /tmp/tmp: No such file or directory

http://merge-tracking.open.collab.net/ds/viewMessage.do?dsForumId=57&dsMessageId=77069

Issue Links

• is duplicated by: SVN-3078 Problem with CRLF handling during diff/merge