Re: Disabling automatic conflict resolution?

On Mon, Aug 18, 2003 at 10:40:12AM -0500, Ben Collins-Sussman wrote:
> "Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:
> > I'm totally in agreement with you. I have no problem with the
> > current functionality. But I'm trying to rally support for
> > subversion from the development team. "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." We could change --paranoid to
> > --unreasonably_paranoid just to make it clear... ;)
>
> Or put on your Carl Sagan voice: "*billions* of users have been using
> CVS for years, and have had no problems with this..."

Remember that in CVS you get a .#file.version backup file after a merge,
so it's not surprising that CVS users have been OK. (Although I agree
that 'svn up -roldrev' should usually be enough.)

-- 
Colin Watson                                  [cjwatson@flatline.org.uk]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org