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

Question on using --diff-cmd

From: Jeff Price <jefferyrprice_at_gmail.com>
Date: 2005-03-01 13:32:08 CET

I've browsed the archives and saw some discussion back in 8/2003 on
using --diff-cmd with an external diff program. I'm trying to do that
now on Mac OS X (10.3.8) with Subversion 1.1.3. I want to pass the
files for comparison to opendiff (FileMerge) using the most basic
syntax:
> opendiff <left> <right>

Much like someone did back then, I wrote a simple Perl script to
report back the arguments passed by svn diff --diff-cmd with the
following results (for example):
---------------------------------------------------------------------------------
>$ svn diff --diff-cmd svndiffargs.pl Day.txt
Index: Day.txt
===================================================================
numArgs = 7
0 : -u
1 : -L
2 : Day.txt (revision 1)
3 : -L
4 : Day.txt (working copy)
5 : .svn/text-base/Day.txt.svn-base
6 : .svn/tmp/Day.txt.tmp
>
---------------------------------------------------------------------------------

In the thread from 2003, the final argument (6) was not a .tmp file
under .svn/tmp but was instead the actual working copy file name. The
problem is that the tmp file now given by argument 6 does not exist
when my Perl script tries to launch my external diff program
(opendiff). If I pass the base file (arg 5) as both the <left> and
<right> arguments for opendiff, though, it launches fine (with no
differences of course).

Any ideas (hopefully other than string parsing one of the arguments)
on how to pass the working copy path along to opendiff?

Thanks!
Jeff

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 16:38:37 2005

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