[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: pointing diff3-cmd to false.bat does not seem to work for me

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-09-21 00:18:51 CEST

Stefan Küng wrote:
> Michael Toal wrote:
>> I have noticed that you periodically are asked how to force
>> tortoisesvn to manually merge changes during an update.
>>
>> The stock answer seems to be:
>> Settings -> Subversion configuration file -> click the edit button
>> Change the [helpers] section by adding:-
>> diff3-cmd = "C:\false.bat"
>
> Either use forward slashes (e.g. "C:/false.bat"), or use double
> backslashes (e.g. "C:\\false.bat"). A single backslash is treated as an
> escaping sequence.
>
>> Creating a C:\false.bat which contains only the following line:-
>>
>> exit /B 1
>
> Only "exit 1", without the /B switch. Otherwise you don't return the
> error code.
>
> With this, it works for me just fine.

Added to the FAQ http://tortoisesvn.net/node/241

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Sep 21 00:18:15 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.