Re: Patch created by TSVN cannot be applied by TSVN

Johan Appelgren wrote:

>> The reason TortoiseMerge can't apply your patch is because the file
>> /v2/mbunit/MbUnit.Framework/TestCase.cs
>> has several lines ending with CR only instead of LF or CRLF. CR only
>> lineendings are not supported by TortoiseMerge.
>
> Okey. I wasn't aware of that. Thanks.

You should set the svn:eol-style property on all your files (e.g. to
'native'). This not only avoids such problems, but also saves space in
the repository (1 byte per line, since with that setting subversion
stores the lines with LF endings in the repository and doesn't have to
save the lineendings as they are), avoids problems with inconsistent
line endings (Subversion will throw an error if a file contains
inconsistent endings so you can correct them before committing) and if
you're using the mailer.py post-commit hook script to send out commit
mails it will avoid the empty lines in the mails (without the property,
mailer.py will send mails like this:
+ line which was added with CRLF lineendings

+ line which was added with CRLF lineendings2

+
...

(notice the empty line after every diffed line).

And once you set the property on all files, make sure you also set up
the autoprops so you don't forget to add it on new files as well.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org