Re: Whitespace conflicts during merges

On 29.09.2011 19:29, Rolf Campbell wrote:
> I often find myself cleaning whitespace in code, then using TSVN to
> update my working copy and having conflicts on the lines I've modified
> whitespace (because someone else modified whitespace too).
>
> I know that I can set the diff viewer (and merge program) to ignore
> whitespace differences, but is there any way to tell TSVN to ignore
> whitespace differences when performing merges during a working copy update?
>
> In the command-line tools, there is a '--diff3-cmd' option to specify a
> merge command. I suspect I could use that to provide a merge command
> that ignored whitespace differences during the merge. I was hoping TSVN
> could provide something similar.

You can ignore whitespaces during a merge just fine with TSVN as well.
But ignoring them during an update is simply not possible, neither with
TSVN nor with the command line client. An update's job is to bring the
working copy to the same state as in the repository. If you could ignore
whitespaces during an update, then the result would not reflect the
repository state.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2847952
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].