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

Re: Status of external diff ?

From: Michael Wood <mwood_at_its.uct.ac.za>
Date: 2004-01-09 13:05:23 CET


On Fri, Jan 09, 2004 at 01:09:38PM +0200, Torsten Rueger wrote:
> Moi,
> I'm trying to store xml in subversion and am looking for a way to
> avoid artificial conflicts (those that you get by treating xml as
> text)
> Concretely, what would be the interface of a diff-cmd and diff3-cmd ?
> I have some xml diff/merge tool, I could experiment. Shouldn't it be
> possible to specify diff-cmd when doing a check-in ?

Subversion assumes any external diff or diff3 command is GNU diff or GNU
diff3. You can write scripts for your XML diff/merge tools that take
GNU diff/diff3 commandline options and call your tools with the correct
options. (I've not tried this, though.)

Hope this helps :)

Michael Wood <mwood@its.uct.ac.za>
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 9 13:06:02 2004

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