When doing a merge on files with svn:eol-style set to CRLF where there
is a conflict, the merge fails with this message:
svn: Inconsistent line ending style
The problem appears to be that one of the tmp files that svn creates
has LF eols and when svn goes to merge, it finds an inconsent lin
endings.
Here's a recipe:
svnadmin create repos
svn co file:///`pwd`/repos r
cd r
cp /etc/group .
unix2dos group
svn add group
svn ps svn:eol-style CRLF group
svn ci -m ''
sed -e 's/root:/Aroot:/' group > g
mv g group
svn ci -m ''
sed -e 's/Aroot:/Broot:/' group > g
mv g group
svn merge -r 2:1 group group
Running file on group* shows this:
% file group.*
group.61096.00001.working: ASCII text, with CRLF line terminators
group.61104.00001.r1: ASCII text, with CRLF line terminators
group.61112.00001.r2: ASCII text, with CRLF line terminators
group.61132.00001.tmp: ASCII text, with CRLF, LF line terminators
group.61308.00001.tmp: ASCII text, with CRLF line terminators
group.61316.00001.tmp: ASCII text, with CRLF line terminators
The lines in group.61132.00001.tmp that have LD line ending are:
<<<<<<< .working
=======
>>>>>>> .r1