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

Re: Re: Subversion merge conflicts (part 2)

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 3 Jul 2008 09:23:28 +0100

2008/7/2 Gleason, Todd <tgleason_at_impac.com>:
> Is there any way in which you can set svn:eol-style such that it ignores tabs vs. spaces kind of whitespace, or are you (as I expect) just referring to CRLF conversion?
>

eol-style does what it says on the tin - end-of-line style. It is
there as a convenience to iron out differences between *nix (LF), Mac
(CR) and Windows (CRLF) line endings where the same files are used in
different OSes.

>> > And whose whitespace is used when you ignore whitespace? Is it a
>> > combination of "mine" and "theirs"?
>>
>> The whitespaces of 'theirs', but from 'mine' if 'mine' has lines which
>> 'theirs' doesn't.
>>
>>
>> > Or do you need to mandate tabs or spaces for everything to work
>> smoothly?
>>
>> Of course: how should Subversion/TSVN know that you don't care about
>> whether a space is there or a tab? There are programming languages where
>> that makes a *big* difference. So Subversion *has* to treat those
>> differences as real differences and can't just ignore those.
>> It *can* ignore those for *showing* you a diff, but that's all.
>
> Thanks very much for the information. Unfortunately I have to press a bit further. In mentioning this to co-workers, the response I'm getting back is that it is hard to believe this is not configurable such that you could prevent conflicts, and that we should spend some time to be sure.
>
> Also, the point that there are a few languages (out of hundreds) that are sensitive to tabs vs. spaces is something they find surprising. Consider that for those languages, you would not be using an editor that made it easy to swap between tabs and spaces. Therefore you would not be exposed to this issue except for languages where it isn't an issue of correctness.

It is not the job of the version control system to work out whether
changes in files are important or not. EOL style is a special
exception to that as it such a common difference between operating
systems, but it is the only exception. One could also argue that some
languages don't care about upper/lower case, and indeed programs like
VB change case without you even asking. Again, it is a pain, but it is
not subversion's problem. The VCS has to *reliably* record the state
of files, and ambiguities of whitespace and case are just not on.

>
> So I have to ask if there is more documentation you can point me at that supports your statements that it is impossible to configure Subversion to ignore tabs vs. spaces kind of whitespace when doing updates and merges, and that you will get "bogus" conflicts in these cases.

If you want the 'official' answer, you need to ask on the subversion
users mailing list.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-03 10:23:39 CEST

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