From users-return-16376-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Fri Oct 5 13:15:33 2012 Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D2ACD08D for ; Fri, 5 Oct 2012 13:15:33 +0000 (UTC) Received: (qmail 54575 invoked by uid 500); 5 Oct 2012 13:15:32 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 54430 invoked by uid 500); 5 Oct 2012 13:15:31 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 54396 invoked by uid 99); 5 Oct 2012 13:15:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 13:15:30 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of James.French@naturalmotion.com designates 86.12.140.205 as permitted sender) Received: from [86.12.140.205] (HELO mail1.naturalmotion.com) (86.12.140.205) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 13:15:22 +0000 From: James French To: "users@subversion.apache.org" Date: Fri, 5 Oct 2012 14:11:35 +0100 Subject: RE: svn:eol-style native and reintegrate merge Thread-Topic: svn:eol-style native and reintegrate merge Thread-Index: AQHNoni3SpjgCFKOxESL9RaTUE3nNJeqZpFHgAA2K0CAABQ3sQ== Message-ID: <950618E0D00138499BE7CC487EBF646D787C047D2D@WOODCHUCK.NM.local> References: <950618E0D00138499BE7CC487EBF646D787C047D18@WOODCHUCK.NM.local>,<950618E0D00138499BE7CC487EBF646D787C047D1B@WOODCHUCK.NM.local>,<950618E0D00138499BE7CC487EBF646D787C047D28@WOODCHUCK.NM.local> In-Reply-To: <950618E0D00138499BE7CC487EBF646D787C047D28@WOODCHUCK.NM.local> Accept-Language: en-US, en-GB Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 I've got to the bottom of this now, sort of. Bottom line is that 1.7 seems = fine after all. Even though all the files changed to UNIX line endings, whe= n I committed them they flipped back to windows in my working copy. I think= that that is very weird and disconcerting behaviour, and it didn't happen = in all the repositories I tested this in (which is also weird and disconcer= ting). I still think there's an issue here and it could be improved but at = the end of the day everything seemed to turn out OK. Is there some repo sid= e config that could affect this? ________________________________________ From: James French [James.French@naturalmotion.com] Sent: 05 October 2012 12:59 To: users@subversion.apache.org Subject: RE: svn:eol-style native and reintegrate merge http://svn.apache.org/viewvc?view=3Drevision&revision=3D1355703 Fix a bug in propset which could prevent updating cached values related to EOL expansion in wc.db. Justification: Incorrect behaviour, subtle working copy corruption. Votes: +1: stsp, rhuijben, philip This was a 1.7.6 fix and it sounds scarily pertinent.... ________________________________________ From: James French [James.French@naturalmotion.com] Sent: 05 October 2012 09:58 To: users@subversion.apache.org Subject: RE: svn:eol-style native and reintegrate merge ________________________________________ From: James French [James.French@naturalmotion.com] Sent: 04 October 2012 22:39 To: users@subversion.apache.org Subject: svn:eol-style native and reintegrate merge 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 Thanks Thorsten for your reply, replying here for simplicity. It is primar= ily a windows codebase and all source code has always had windows line endi= ngs. I am thoroughly confused. I tried the reintegrate merge with svn 1.6.1= 8. With --ignore-eol-style the merge went through with no conflicts and the= files in my working copy all still had windows line endings (as it should = be). However, when I did a diff it still showed every line of every file as= having changed, even though there was no physical difference on disk. When= I diff with --ignore-eol-style only the svn:eol-style native property chan= ges show up. Why is the diff showing line changes? I guess its because its = telling me that the internal data has been changed to LF line endings. Fair= enough. Still seems weird that a working copy diff should show this though= . I still wonder whether this whole native eol thing is going to bite me in= the arse later and cause a load of conflicts that rattle around the codeba= se for ages (over the years svn has unfortunately taught me to expect this = kind of stuff). What I don't accept though is that svn 1.7 is performing correctly. The mer= ge *physically changed* all the source files in my working copy to LF line = endings on a windows boc. That *cannot* be right. James