[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn:eol-style native and reintegrate merge

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Fri, 5 Oct 2012 10:15:46 -0500

On Fri, Oct 5, 2012 at 8:11 AM, James French
<James.French_at_naturalmotion.com> 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 is very weird and disconcerting behaviour, and it didn't happen in all the repositories I tested this in (which is also weird and disconcerting). 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 side config that could affect this?

That doesn't make much sense. An update should change them in the
working copy, not a commit. Then again, you should do an update after
a commit anyway to avoid mixed-rev WCs so you'd end up with the same
(and expected) result.

-- 
   Les Mikesell
     lesmikesell_at_gmail.com
Received on 2012-10-05 17:16:19 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.