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

Merge reports conflict on extern properties

From: David Kitchen <dave.kitchen_at_insync.tv>
Date: Fri, 04 Feb 2011 09:26:01 +0000

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?

David Kitchen
InSync Technology Ltd
13B, Dragon Street
Hampshire GU31 4JN
+44 (0) 1730 235 117
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-04 10:41:46 CET

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