On 2011-10-02 02:37, Stefan Küng wrote:
> On 30.09.2011 00:07, Rolf Campbell wrote:
>> On 2011-09-29 16:04, Stefan Küng wrote:
>>> On 29.09.2011 19:29, Rolf Campbell wrote:
>>>> 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
>>
>> I don't think I explained myself very well, I'll try again.
>>
>> I'm not asking to ignore whitespace during the update, just during any
>> merges that are necessary during the update. I'll give a specific example:
>>
>> Say there is some file "a.txt".
>>
>> Rev#1 of this file has this content [without the quotes] (I'm using
>> periods as a placeholder for spaces):
>> "..b"
>>
>> Rev#2 of this same file has this content:
>> "..c"
>>
>> I checkout Rev#1. I then make some whitespace changes which cause it to
>> look like this:
>> ".b" (I deleted a space at the beginning).
>>
>> I then perform an svn update. svn noticed that the file has been
>> changed locally, and been changed in the repository. It now must MERGE
>> those changes. Normally, it would mark that change as a conflict.
>>
>> If you specify the '--diff3-cmd' argument to "svn up" you can tell it to
>> ignore whitespace. Doing so causes "a.txt" to resolve without conflicts
>> during the update.
>
> 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'?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2850215
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-05 15:35:20 CEST