[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict detection in 'svn merge'

From: David Glasser <glasser_at_davidglasser.net>
Date: Tue, 19 Feb 2008 16:32:57 -0800

On Feb 19, 2008 6:31 AM, Stephen Butler <sbutler_at_elego.de> wrote:
> A record-only merge is done when the two source URLs A and B have a
> common ancestor C that is neither A nor B. See the comment in
> svn_client_merge3 (libsvn_client/merge.c):
>
> A != B != C we merge the changes between A and B without
> merge recording, then record-only two merges:
> from A to C, and from C to B
>
> I think we want to detect tree conflicts during the A-to-B merge,
> not during the record-only merges. Please see my next comment below.

Record-only merges are also done when the user runs "svn merge
--record-only" (say, to simulate "svnmerge block").

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-20 01:33:07 CET

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