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

Re: PLEASE HELP...Merging files with a changed property

From: Jean-Luc Wasmer <jl+subversion_at_lists.wasmer.ca>
Date: 2005-06-16 22:46:12 CEST

kfogel@collab.net wrote:

>Jean-Luc Wasmer <jl+subversion@lists.wasmer.ca> writes:
>
>
>>I'm rephrasing my problem since I didn't get any answer to my original post.
>>
>>When I merge two branches which only difference is the value of the
>>svn:eol-style property for a couple of files, I get a working copy
>>that I can't commit: Subversion shows the 'U' flag during the merge
>>but a "svn status" on the working copy returns nothing (no
>>modification) and "svn propget svn:eol-style" on the specific files
>>returns the old value.
>>
>>Am I doing something wrong here?
>>
>>(I use Subversion 1.2)
>>
>>
>
>Heh, I'll bet I know what's happening. The client "normalizes" the
>values of certain svn: properties. For example, one person might set
>this:
>
> svn:eol-style ==> "NATIVE"
>
>And another might set it to:
>
> svn:eol-style ==> "Native"
>
>And a third might set it to:
>
> svn:eol-style ==> "native"
>
>Subversion normalizes them all to the third way, I think: "native".
>
>
well in my case, svn merge normalizes "LF" to "native" :-)

JL

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 22:48:28 2005

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