[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: <kfogel_at_collab.net>
Date: 2003-08-18 16:43:07 CEST

"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:
> One of my users asked me the same thing. She said, "What if, when I update,
> a file I've been working on is merged with some lines from someone else, and
> even though there are no conflicts, this breaks the code?"
>
> I answered, "After you update, build and run it to make sure it's working."
>
> She replied, "Yeah, but my working copy is now lost, as it was replaced with
> the merged version. So now I have to manually go through the file and try to
> sort out my code from the other code. I think I'll make a backup of my
> working copy before I update each time."

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."

-Karl

---------------------------------------------------------------------
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:27:49 2003

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