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

Status of external diff ?

From: Torsten Rueger <torsten.rueger_at_hiit.fi>
Date: 2004-01-09 12:09:38 CET


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)

Looking through the command line arguments and some code, I found that
there is a some references to diff-cmd and diff3-cmd just they are not
documented and seem (?) incomplete.

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 ?

If this is work in progress, I'd be happy to help. I can code, and
given some time/help should be able to make the necessary changes.
Eg, one could have a svn: property to specify the diff/merge tool, or
set up an suffix -> tool mapping somewhere.
As I understand this issue is planned for post 1.0 anyway, so maybe
it's a good time to start ?



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 9 12:10:10 2004

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