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

Re: End of the Line for Merge? [Merging and EOL Style Problem]

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-08-15 23:52:27 CEST

On Aug 15, 2006, at 17:39, Nico Kadel-Garcia wrote:

>> I'd assumed I could simply set the svn:eol-style on all appropriate
>> files and commit; I think SVN itself modifies the files (in the
>> repository, at least) on the commit. Or am I mistaken? (My working
>> copy might need a "downdate"/update-cycle to deal with the working
>> copies of files, perhaps.)
> Nope. You've already got the files in place, and will wind up with
> looniness such as excess EOL characters of the wrong type in the
> most unexpected places. It's much cleaner to reset the currently-
> binary-stored files first, then inflict the EOL on them. The other
> way around doesn't work well.

I was under the impression that Subversion would handle this very
well. If the file in question has line endings that are all one style
(all LF, all CR or all CR LF) then Subversion will be able to apply
your desired line ending style. If the file in question has mixed
line endings (some lines ending with LF, some ending with CR LF, as
can occur when using misconfigured or brain-dead editors) then
Subversion will state that the file has mixed line endings and will
do nothing and you will need to normalize the line endings (with
dos2unix or whatever) before proceeding.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 15 23:54:04 2006

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.