Subversion merge conflicts (part 2)

I see that the main question on the "SVN Merge Conflicts Issue" thread
is resolved, but I have a related question about conflict detection.
For me, it's not an EOL issue but a tabs vs. spaces one.

Looking at http://subversion.tigris.org/svn_1.4_releasenotes.html I see:

svn diff -x [-u | -b | -w | --ignore-eol-style]

You can make the internal svn diff ignore whitespace, according to this.
Does this apply in terms of conflict detection? If so, how do you
configure Tortoise and/or the command line client to ignore whitespace
in a diff? Note that users might want to swap between clients and would
expect no problems.

And whose whitespace is used when you ignore whitespace? Is it a
combination of "mine" and "theirs"?

Or do you need to mandate tabs or spaces for everything to work
smoothly?

 
Received on 2008-06-30 19:28:39 CEST