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

RE: Disabling automatic conflict resolution?

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-08-18 19:34:53 CEST

At 10:35 AM -0500 8/18/03, Wadsworth, Eric (Contractor) wrote:
> "Try it and you'll see" almost works, but better would be
>"Oh, if you're worried, just do a 'svn up --paranoid' and it will make a
>copy of each of your pre-merged files before doing its automatic merge."

Try "oh, and if you ever have any doubts,

At 10:01 AM -0500 8/18/03, kfogel@collab.net wrote:
> $ svn diff foo.txt > my-adjusted-changes.txt
> $ svn up -r<EARLIER_REV> foo.txt

will get you right back where you started."

That covers doubts about the tool. It also covers the occasional
personal slip-up (which you don't have to actually *mention*, but
which is always in the back of everyone's head!).

But cheer up! Even if there were a "--paranoid" switch, some people
would make a copy first, anyway. I know this, because ClearCase
_has_ such a switch (it's spelled "-error"), and some people do this
anyway, especially when first learning the tool. The truly paranoid
know, after all, that the tool can screw up even "keep a copy on the
side"!

-- 
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 19:39:35 2003

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