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

RE: Re: 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-22 14:53:05 CEST

Thanks for the quick response.
That also worked for me (partially).

What works:
If
Person A Updates and then makes change A to the working copy
Person B Updates and then makes change B to the working copy
Person A Commits change A.
Person B Updates in order to incorporate any other users changes.
There is a conflict because false.bat returned an error code.
Person B resolves the conflict by hand and then Commits their change.

What doesn't work.

Person A Updates and then makes change A to the working copy
Person B Updates but does not make any changes yet.
Person A Commits change A.
Person B makes change B
Person B Updates in order to incorporate any other users changes.
Change A from Person A's Commit is automatically merged into Person B's copy.

You may say I am being paranoid, but I am currently trying to trial and advocate subversion.

What happened was that I was happily making commits to the trunk.
A colleague Checked Out from a tag from further down the trunk (or an old revision).
My working copy was synced up with the head of the trunk.

He made changes and then Commited them to the head of the trunk, undoing changes that I had made.

I then Updated and it performed an automatic merge.
If I had to manually merge, then I would have noticed the missing code.

I hope that you can understand that it is difficult to advocate, when mistakes like this happen in the trial.

Offtopic, but just to point out my other advocacy problem is Issue 1256, which I notice is 1.5-consider. How can I vote for 1.5-definate.

Thanks for your response and please point out any procedural mistakes in the way we were using subversion.

-----Original Message-----
From: Simon Large [mailto:simon@skirridsystems.co.uk]
Sent: 20 September 2006 23:19
To: users@tortoisesvn.tigris.org
Subject: Re: pointing diff3-cmd to false.bat does not seem to work for me

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
________________________________________________________________________
This e-mail has been scanned for all viruses by Star.The service is powered by MessageLabs. 
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Sep 22 14:53:32 2006

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