On 05.10.2011 18:29, Rolf Campbell wrote:
> On 2011-10-05 10:49, Stefan Küng wrote:
>>>> Unfortunately, the svn_client_update4() API doesn't allow to set any
>>>> diff options, unlike the svn_client_merge4() API.
>>>> Stefan
>>>
>>> If that's true, then how does the command-line svn implement '--diff3-cmd'?
>>
>> the --diff3-cmd option does *not* specify that you want to ignore
>> whitespaces. It specifies that you want to use another diff tool
>> instead of the internal one.
>>
>> what I'm talking about however is the '-x' parameter you can pass to
>> e.g. the merge command.
>>
>> if you want to use an external diff tool with TSVN, you can specify
>> that in the config file.
>> Stefan
>
> You are correct, the --diff3-cmd does not specify that you want to
> ignore whitespaces, but it DOES let you choose a merge tool that DOES
> ignore whitespaces.
>
> You are also correct in that you can over-ride the default diff3 in the
> config file, so that resolves the core of my problem. By specifying a
> custom diff3-cmd in the option file, I can cause TSVN to ignore
> whitespaces during any file-merges during an update.
>
> I guess I was hoping for a configuration entry in the GUI for setting
> this up, like a checkbox "Ignore whitespace during merges during
> updates" or something of the sort that would automatically change the
> diff3-cmd option to point to some merge tool that ignored whitespace.
> As I understand it, that could certainly be done, but since I seem to be
> the only one that's ever complained about it missing, maybe it's not
> quite as important as I imagine it being.
You could ask on the Subversion mailing list for an enhancement to the
svn_client_update API that allows passing those parameters.
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=2850259
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-05 18:43:59 CEST