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

merging xml files

From: Gabriel Scolan <gabriel.Scolan_at_gmx.net>
Date: Sun, 22 Jun 2008 11:30:53 +0200


I'd like to know if someone has a solution to automatically merge two
xml files (by merge or update operation) using svn ?
I've got an example where SVN doesn't solve the conflict itself :
File 1, in the repository
<node attribute="my attribute" property="my prop"/>
File 2, started from file 1 and committed to the repository
<node attribute="my attribute2" property="my prop"/>
File 3, started from file 1 but in the workarea
<node attribute="my attribute" property="my prop 2"/>
I'd like to get the following merge result,
<node attribute="my attribute2" property="my prop 2"/>

In other words, the attributes of the nodes have both changed but they
are 2 separate entities, so mergeable without conflict (but as they are
on the same line, svn raise the conflict)
I'm using svn-1.4.6

thanks in advance

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-22 16:17:57 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.