Re: svn:eol-style native and reintegrate merge

2012-10-05 Thread Les Mikesell
On Fri, Oct 5, 2012 at 8:11 AM, James French wrote: > 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, when > I committed them they flipped back to windows in my working copy. I think > that that

RE: svn:eol-style native and reintegrate merge

2012-10-05 Thread James French
ld affect 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=revision&revision=1355703 Fix a bug in propset which could prev

RE: svn:eol-style native and reintegrate merge

2012-10-05 Thread James French
.7.6 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

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 > environ

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 o

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 c

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 svn:eol-style

Re: svn:eol-style native and reintegrate merge

2012-10-04 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 Subve

svn:eol-style native and reintegrate merge

2012-10-04 Thread James French
Hi, Using svn 1.7.6 and working on a dev branch I wrote a script to set svn:eol-style=native 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 line endings so I kept fixing them until I was able to check in. So fa

svn:eol-style native and reintegrate merge

2012-10-04 Thread James French
Hi, Using svn 1.7.6 and working on a dev branch I wrote a script to set svn:eol-style=native 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 line endings so I kept fixing them until I was able to check in. So fa

svn:eol-style native and reintegrate merge

2012-10-04 Thread James French
Hi, Using svn 1.7.6 and working on a dev branch I wrote a script to set svn:eol-style=native 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 line endings so I kept fixing them until I was able to check in. So fa