Re: TMerge whitespace handling

Tobias Schäfer wrote:
>> Does the "ignore ending whitespace" option ignore *only* ending
>> whitespace, or does it ignore leading whitespace as well?
>
> It only ignores *ending* whitespace. This is usefull for languages (eg.
> python) where the leading spaces influence the control flow but ending
> whitespace is not relevant, see #233.

Right, but if you want to ignore ending whitespace in python, you
probably also want to ignore it in other languages too. At the moment
you can't ignore leading AND ending whitespace.

>> Should these perhaps be checkboxes so you can choose to ignore
>> leading/ending/inline spaces independently?
>
> Three checkboxes could actually replace the four radio buttons and offer even
> more combinations:
> [ ] Ignore leading whitespace
> [ ] Ignore inline whitespace
> [ ] Ignore ending whitespace
>
> I'm not sure if this is needed though.

No, probably not. I'm just being picky and looking for inconsistencies ;-)

Simon

-- 
        ___
   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