[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: John Peacock <john.peacock_at_havurah-software.org>
Date: Mon, 23 Jun 2008 14:35:06 -0400

Gabriel Scolan wrote:
> 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 ?

You are looking for the 'diff3-cmd' line in the .subversion/config file.
  You may want to take a look at svndiffwrapper:


for one example of how to wrap a merge tool into the Subversion
workflow. I have modified the above script slightly to always attempt
the automatic merge and only call up the graphical merge tool if that
fails (the script as it stands always prompts first).


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:35:31 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.