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

Re: merging xml files

From: Gabriel Scolan <gabriel.Scolan_at_gmx.net>
Date: Mon, 23 Jun 2008 20:28:41 +0200

Hi Paul,

thanks for this quick answer!
Can you give me a tip where I can hook the "update" action to determine
with an other diff tool whether there is a conflict or not and indicate
to the user where the conflict is in such a case or simply merge without
any other warning to the user ?
many thanks

Paul R a écrit :
> Gabriel Scolan <gabriel.Scolan_at_gmx.net> writes:
>> I'd like to know if someone has a solution to automatically merge two
>> xml files (by merge or update operation) using svn ?
> SVN server side does NOT do any merge operation. Merge happens on the
> client side when working copy as diverged from server copy. You can
> call ANY process you want to carry ANY type of intelligent merge, this
> is NOT svn job. As a convenience, svn client is shipped with the most
> common diff/patch line-by-line merging mechanism, which can not handle
> this case. You'll have to find some dedicated xml merging tools, or
> write your own.

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-23 20:29:05 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.