[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: Wadsworth, Eric (Contractor) <wadswore_at_fhu.disa.mil>
Date: 2003-08-18 17:35:42 CEST

> I'm not sure this is a big enough problem to warrant any special
> support. Honestly, in ~8 years of working with copy-modify-merge
> revision control systems (CVS and then Subversion), I think I've maybe
> lost a total of 30 minutes to this sort of semantic problem. Usually
> I knew in advance (from commit mails or other forms of developer
> communication) that the incoming change was dangerous, and adjusted my
> update accordingly.
>
> If your user has had a different experience, that's one thing. But if
> she's just *anticipating* a problem, then I want to say "Try it and
> you'll see."

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...
;)

--- Eric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 17:38:23 2003

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