Re: TMerge whitespace handling

Simon Large wrote:
> Tobias Schäfer wrote:
>>>> Three checkboxes could actually replace the four radio buttons and
>>>> offer
>>>> even more combinations:
>>>> [ ] Ignore leading whitespace
>>>> [ ] Ignore inline whitespace
>>>> [ ] Ignore ending whitespace
>
> You could reduce the combinations to something more sensible:
> [ ] Ignore all whitespace
> [ ] Ignore leading whitespace
> [ ] Ignore ending whitespace
>
> If the first box is checked, the other two are disabled - ignoring
> inline space but showing leading/trailing space doesn't make much sense.
>
> If you are *not* ignoring all whitespace, then you can choose which
> combination of leading/trailing spaces suits you best.
>
>>>> I'm not sure if this is needed though.
>>> No, probably not. I'm just being picky and looking for
>>> inconsistencies ;-)
>>
>> Anyone out there who needs it?
>
> Why does anyone need to ignore ending whitespace for python? And if you
> need to ignore it for python, why not in any other language?

Subversion 1.4 will have options to ignore whitespaces when diffing.
Those options are:
   /** Ignore no whitespace. */
   svn_diff_file_ignore_space_none,

   /** Ignore changes in sequences of whitespace characters, treating each
    * sequence of whitespace characters as a single space. */
   svn_diff_file_ignore_space_change,

   /** Ignore all whitespace characters. */
   svn_diff_file_ignore_space_all

So, no "ignore leading" or "ignore trailing" whitespaces. Do we really
need those? We could drop those, and then just use the same ones as
Subversion has.

Stefan

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