Re: svn:eol-style native and reintegrate merge

2012-10-05 Thread Thorsten Schöning
Guten Tag James French, am Donnerstag, 4. Oktober 2012 um 23:38 schrieben Sie: Now that I come to reintegrate however I have had a shock - it has converted all files to unix line endings (and I'm on a PC). On native eol-style, Subversion internally stores LF line endings. Note that

RE: svn:eol-style native and reintegrate merge

2012-10-05 Thread James French
From: James French [james.fre...@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

Re: svn:eol-style native and reintegrate merge

2012-10-05 Thread Thorsten Schöning
Guten Tag James French, am Freitag, 5. Oktober 2012 um 10:58 schrieben Sie: Thanks Thorsten for your reply, replying here for simplicity. Inline quotes are simple... When I diff with --ignore-eol-style only the svn:eol-style native property changes show up. Why is the diff showing line

Re: svn:eol-style native and reintegrate merge

2012-10-05 Thread Thorsten Schöning
Guten Tag James French, am Freitag, 5. Oktober 2012 um 12:17 schrieben Sie: Inline quotes are simple... http://www.netmeister.org/news/learn2quote.html A working copy diff is when I diff my working copy against the repo. I did not expect to see all my files changed to unix line endings on

Re: svn:eol-style native and reintegrate merge

2012-10-05 Thread Thorsten Schöning
Guten Tag James French, am Freitag, 5. Oktober 2012 um 13:01 schrieben Sie: Would you agree with all this? Yes, what you've found is what I would expect. Basically its all behaving great and is doing what I expect and want. The only weird thing is with my branch in our production

RE: svn:eol-style native and reintegrate merge

2012-10-05 Thread James French
fix and it sounds scarily pertinent From: James French [james.fre...@naturalmotion.com] Sent: 05 October 2012 09:58 To: users@subversion.apache.org Subject: RE: svn:eol-style native and reintegrate merge From

RE: svn:eol-style native and reintegrate merge

2012-10-05 Thread James French
this? From: James French [james.fre...@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=revisionrevision=1355703 Fix a bug in propset which could prevent updating cached values