Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of
 James.French@naturalmotion.com designates 86.12.140.205 as permitted sender)
From: James French <James.French@naturalmotion.com>
To: "users@subversion.apache.org" <users@subversion.apache.org>
Date: Thu, 4 Oct 2012 22:38:40 +0100
Subject: svn:eol-style native and reintegrate merge
Thread-Topic: svn:eol-style native and reintegrate merge
Thread-Index: AQHNonieT7+I/J6KWEKF8yaYyV0Yeg==
Message-ID: <950618E0D00138499BE7CC487EBF646D787C047D16@WOODCHUCK.NM.local>
Accept-Language: en-US, en-GB
Content-Language: en-GB
acceptlanguage: en-US, en-GB
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Hi,

Using svn 1.7.6 and working on a dev branch I wrote a script to set svn:eol=
-style=3Dnative on all source code files, because we develop on Mac and PC.=
 When I tried to check in it kept failing on files that had inconsistent li=
ne endings so I kept fixing them until I was able to check in. So far so go=
od. The diff of the checkin showed that files with consistent line endings =
(99% of them) simply had the svn:eol-style=3Dnative property on them which =
is what I expected. Now that I come to reintegrate however I have had a sho=
ck - it has converted all files to unix line endings (and I'm on a PC). We =
do our sync up merges with the --ignore-eol-style style switch (to be hones=
t I'm not sure exactly what this does). I tried reintegrating with and with=
out switch and it does the same - everything has unix line endings. Maybe i=
ts just some weird glitch and it won't really change the line endings but I=
'm too scared to check in to find out. Tomorrow I'm going to try with 1.6 a=
nd see what that does.

What the hell is going on?

Cheers,
James=