[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: <james-tigris_at_jrv.org>
Date: 2003-08-17 08:01:22 CEST

Thanks - that's what I meant. I used the wrong terminology.

It looks like this line in libsvn_wc/merge.c:svn_wc_merge() is the
heart of the matter:

          contains_conflicts = svn_diff_contains_conflicts (diff);

might perhaps become

          contains_conflicts = diff != NULL;

to say that any difference at all always becomes a conflict. This
seems to be what the code does if an external diff3 is used anyway: it
appears that automatic non-conflict merging never happens with an
external diff3.

I realize that automatic merging is a helpful feature. But the people
I'm helping evaluate SVN would rather flag such cases for human
intervention.

-----Original Message-----
From: kfogel
Sent: Saturday, August 16, 2003 10:50 PM
Subject: Re: Disabling automatic conflict resolution?

cmpilato@collab.net writes:
> Subversion has no automatic conflict resolution.

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
Received on Sun Aug 17 09:18:04 2003

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