[sldev] Patch format question

[Carsten Juttner]

Felix Duesenburg wrote:
> I'm not exactly sure how mixing can occur. A wild guess would be that 
> it happens when you create a patch on Windows from a file in UNIX 
> format, both in the repository and in your working copy. Or vice 
> versa. With no conversion option specified, SVN should treat it as 
> binary, but write out the headers in native format of the OS where it 
> is run (would have to look into the SVN source to verify, didn't find 
> it documented). If 

That's what the svn:eol-style=native property is for. You need to set it 
explicitly or simply add a pattern to the svn config to have it set 
automatically for all source files.

SVN will complain at checkin if it finds a file with a mix of line 
endings so you have a chance to undo any errors with unix2dos.

Personally I never used TortoiseSVN much, I feel more comfortable with 
svn on a command line since I get things done more quickly that way. The 
only thing I liked about it compared to pure svn was the ability to use 
the context menu to solve 3-way merge conflicts.

But after the TortoiseSVN cache repeatedly caused explorer.exe to hang 
(even when turned off) I wrote a small python script to do the 3-way 
merges and uninstalled it.

I am not saying it is bad, I think it's very useful, it just didn't fit 
my needs.

Regards,
Carsten