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

svn:externals merges

From: David Kitchen <dave.kitchen_at_insync.tv>
Date: Fri, 04 Feb 2011 14:28:06 +0000

When I merge branch->trunk with directories carrying svn:externals
properties the property values don't merge but report as conflicted
(Note, I usually use tortoiseSVN: their mailinig list sent me here!) Is
this because the property is seen as a single merge element ? Is there
any workaround for 'same change' conflicts in (svn:externals)
properties? Is there any way of hooking the post-merge event & fixing
the externals up in user space ?

-- 
David Kitchen
InSync Technology Ltd
13B, Dragon Street
Petersfield
Hampshire GU31 4JN
+44 (0) 1730 235 117
Received on 2011-02-04 15:28:54 CET

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