i've noticed a quite annoying behaviour when i'm doing a svn update and 
locally modified files get updated from the server. it seems that svn
doesn't try to merge the changes from the server into my working copy.
it simply creates two conflict sections for the while file.

is this because we haven't set svn:mime-type properties for text
files, and svn assumes they're binary?


regards
  marcel


Roy T. Fielding wrote:
> On Sep 25, 2004, at 2:51 PM, Roy T. Fielding wrote:
> 
>> There are instructions at
>>
>>    http://www.sipfoundry.org/tools/svn-tips.html#line-ends
>>
>> for setting the end-of-line properties to native for text files
>> so that we don't get all that nasty CRLF junk messing up the commit
>> notifications.
> 
> 
> BTW, my .subversion/config file has the following in it:
> 
> [miscellany]
> enable-auto-props = yes
> [auto-props]
> Makefile = svn:eol-style=native
> README = svn:eol-style=native
> INSTALL = svn:eol-style=native
> *.c = svn:eol-style=native
> *.cpp = svn:eol-style=native
> *.h = svn:eol-style=native
> *.dsp = svn:eol-style=CRLF
> *.dsw = svn:eol-style=CRLF
> *.sh = svn:eol-style=native;svn:executable
> *.m4 = svn:eol-style=native
> *.ac = svn:eol-style=native
> *.am = svn:eol-style=native
> *.in = svn:eol-style=native
> *.pl = svn:eol-style=native
> *.css = svn:eol-style=native
> *.java = svn:eol-style=native
> *.jsp = svn:eol-style=native
> *.txt = svn:eol-style=native
> *.html = svn:eol-style=native
> *.xml = svn:eol-style=native
> *.xsd = svn:eol-style=native
> *.dtd = svn:eol-style=native
> *.xslt = svn:eol-style=native
> *.properties = svn:eol-style=native
> *.png = svn:mime-type=image/png
> *.jpg = svn:mime-type=image/jpeg
> *.pdf = svn:mime-type=application/pdf
> 
>