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

Re: merging into locally added files

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 24 Aug 2010 01:07:05 +0200

On Mon, Aug 23, 2010 at 06:40:39PM +0100, Julian Foad wrote:
> You seem to be talking only about the case where the (locally added)
> target is the root of the whole merge, and saying that lack of ancestral
> relationship between the source node and this target node doesn't
> matter. Maybe the user performing the merge is fully aware of what
> he/she is doing, which is fine in this simple case. But what about the
> general case, where the modification to a locally added node may be
> somewhere deep down in a merge that's supposed to be a simple automatic
> merge?

I don't think locally added nodes somewhere deep within the merge target
are affected by this change. Those should be handled by the regular
tree conflict logic. The change only affects the merge target root,
which can now be a locally added file or directory. Previously,
Subversion just errored out on locally added merge target roots
and didn't merge anything at all.

Stefan
Received on 2010-08-24 01:07:49 CEST

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