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

Re: Merge reports conflict on extern properties

From: Felix Saphir <felix.saphir_at_kantarmedia.de>
Date: Fri, 04 Feb 2011 11:02:29 +0100

Am 04.02.2011 10:26, schrieb David Kitchen:
> I have a directory referencing about 100 versioned externs. If two
> developers change separate entries in the externs property, an attempt
> to merge is always marked as a conflict (presumable because the property
> is viewed as a single 'text line'.) However, the TortoiseSVN conflict
> resolution tool (usually) reports the changes correctly (as mergable).
> So, should svn take a more intelligent roll in merging know property
> formats, or can TortoiseSVN apply some hints, or does anyone have better
> ideas on branch-trunk merges of externs: property?

I think that conflict handling is done in the svn library, so there's
nothing TortoiseSVN can do.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-04 11:02:43 CET

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