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

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

From: Michael Toal <Michael.Toal_at_octec.co.uk>
Date: 2006-09-19 10:53:18 CEST

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"

 

Creating a C:\false.bat which contains only the following line:-

exit /B 1

 

Testing:

 

I have a test repository which contains a text file

 

I check out this repository to two folders subtest1 and subtest2

 

I make a change to the text file in subtest1 folder and commit

I navigate to subtest2 and update

 

I expect a forced conflict and have to manually merge, but I get an
automatic merge of my changes.

 

My understanding is that this is a client side setting, but if not
please point me to the correct mailing list.

 

Thanks for the great program.

If I can sort this out, then that will help my argument for swapping
over to subversion.

 

 

________________________________________________________________________
This e-mail has been scanned for all viruses by Star.The service is powered by MessageLabs.
________________________________________________________________________
Received on Tue Sep 19 10:53:29 2006

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