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.
What works:
What doesn't work.
Person A Updates and then makes change A to the working 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.
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.
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-----
Stefan Küng wrote:
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.orgReceived on Fri Sep 22 14:53:32 2006 |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.