[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 16:17:28 CEST

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

Perhaps a useful feature would be a --paranoid switch to the "svn up"
command. This would treat merges like conflicts, I suppose...?

--- Eric

> Is there a way to disable automatic conflict resolution [meaning 'merge'
--- EW], so that all
> conflicts require manual intervention?
>
> I am looking into revision control systems for a company, and they
> would rather never have Subversion resolve any conflict but that have
> the user do this.
>
> If there's no option for this, is there a place in the source code
> where I can easily force all attempts at automatic conflict resolution
> to fail?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 22 05:47:16 2003

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