[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: Sander Striker <striker_at_apache.org>
Date: 2003-08-17 17:16:02 CEST

> From: cmpilato@localhost.localdomain
> [mailto:cmpilato@localhost.localdomain]On Behalf Of cmpilato@collab.net
> Sent: Sunday, August 17, 2003 3:57 PM

> Philip Martin <philip@codematters.co.uk> writes:
>
> > james-tigris@jrv.org writes:
> >
> > > Is there a way to disable automatic conflict resolution, so that all
> > > conflicts require manual intervention?
> >
> > You can use diff3-cmd in ~/.subversion/config (or --diff3-cmd from the
> > command line) to cause Subversion to use an external program rather
> > than the internal merge. The external program can do whatever you
> > want it to, including simply saving the three files without attempting
> > a merge.
>
> Philip gets the Bright Idea award.

Well, I think he wants all changes to be conflicts, and to be marked as such.
IIRC diff3 can do that.

Nevertheless, such a feature (and others) is on my list of diff lib
improvements. Someday...

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 17 17:17:13 2003

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