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

Using an external diff program with Subversion

From: Oliver Dain <odain_at_ll.mit.edu>
Date: 2003-08-09 00:18:11 CEST

I want to use a GUI diff program I have with subversion, so I changed
the subversion config file to point to this program (exam-diff).
Subversion now launches the program as expected, but the program didn't
understand the arguments subversion passed to it. I wrote a 3 line C
program that simply outputs all of the arguments passed to it so I could
see what Subversion was passing to my diff program:

c:>svn diff --diff-cmd "foo.exe" Engine.vcproj
Index: Engine.vcproj
===================================================================
foo.exe
-u
-L
Engine.vcproj (revision 295)
-L
Engine.vcproj (working copy)
.svn/text-base/Engine.vcproj.svn-base
Engine.vcproj

As you can see it passed a -u, 2 -L flags, some names for these files
and THEN the 2 files to be compared. That doesn't work with exam-diff.
It simply wants the names of the 2 files to be compared. How do I get
Subversion to pass just those last 2 command line args (the file
names)? If I try to use the -x option to svn diff passing blanks or
other arguments it passes those arguments AND all the stuff above:

c:> svn diff --diff-cmd "foo.exe" -x "a b" Engine.vcproj
Index: Engine.vcproj
===================================================================
foo.exe
a
b
-L
Engine.vcproj (revision 295)
-L
Engine.vcproj (working copy)
svn/text-base/Engine.vcproj.svn-base
Engine.vcproj

Any help appreciated (this should probably be documented in the manual
somewhere. I could't find it anywhere...)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 9 00:20:02 2003

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