Disabling automatic conflict resolution?

[ja...@jrv.org]

Is there a way to disable automatic conflict resolution, 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

RE: Disabling automatic conflict resolution?

[Sander Striker <st...@apache.org>]

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

> Philip Martin <ph...@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

Re: Disabling automatic conflict resolution?

[cm...@collab.net]

Philip Martin <ph...@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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling automatic conflict resolution?

[Philip Martin <ph...@codematters.co.uk>]

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 Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling automatic conflict resolution?

[kf...@collab.net]

Ben Collins-Sussman <su...@collab.net> writes:
> > I think James means automatic merging.  And we don't have any option
> > to disable automatic merging.
> 
> Sure we do.  Set the svn:mime-type property on every file to something
> non-texty.

I was thinking about that... Trouble is, it breaks 'svn diff'.  And a
lying mime type might cause all sorts of other problems, if not with
Subversion than perhaps with other software.  So it's not a very
pleasant workaround.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling automatic conflict resolution?

[Ben Collins-Sussman <su...@collab.net>]

kfogel@collab.net writes:

> cmpilato@collab.net writes:
> > Subversion has no automatic conflict resolution.  If changes received
> > during an update or switch conflict with local modifications,
> > Subversion will leave conflict markers in the working file, the file
> > will be noted in the working copy metadata as being in a state of
> > conflict, and the user will have to resolve the conflict and/or inform
> > Subversion that the conflict was manually resolved before that file is
> > eligible for commit again.
> 
> I think James means automatic merging.  And we don't have any option
> to disable automatic merging.

Sure we do.  Set the svn:mime-type property on every file to something
non-texty.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling automatic conflict resolution?

[kf...@collab.net]

cmpilato@collab.net writes:
> Subversion has no automatic conflict resolution.  If changes received
> during an update or switch conflict with local modifications,
> Subversion will leave conflict markers in the working file, the file
> will be noted in the working copy metadata as being in a state of
> conflict, and the user will have to resolve the conflict and/or inform
> Subversion that the conflict was manually resolved before that file is
> eligible for commit again.

I think James means automatic merging.  And we don't have any option
to disable automatic merging.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling automatic conflict resolution?

[cm...@collab.net]

james-tigris@jrv.org writes:

> Is there a way to disable automatic conflict resolution, 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?

Subversion has no automatic conflict resolution.  If changes received
during an update or switch conflict with local modifications,
Subversion will leave conflict markers in the working file, the file
will be noted in the working copy metadata as being in a state of
conflict, and the user will have to resolve the conflict and/or inform
Subversion that the conflict was manually resolved before that file is
eligible for commit again.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org