You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Kota, Sreenivasa ShravanaKumar" <sh...@hp.com> on 2008/02/19 07:01:32 UTC

Svn diff

Users,

I would like to use svn diff with the following options

--diff-cmd /usr/bin/diff
-r 2145

Is it possible to pass both the arguments to svn diff ?

I am getting the following error.

Svn diff -r 2145 --diff-cmd /usr/bin/diff 2.x


Index: 2.x
===================================================================
/usr/bin/diff: illegal option -- u
        usage: diff [ -C n ] [ -S name ] [ -bcefhilnrstw ] dir1 dir2
                diff [-C n ] [ -bcefhintw ] file1 file2
                diff [ -D string ] [ -biw ] file1 file2
svn: '/usr/bin/diff' returned 2


Any hints on how to use revision and external diff command in svn diff command ?


Thanks & Regards,
Shravana Kumar

RE: Svn diff

Posted by ni...@planet.nl.
The problem here is that subversion is passing like 11 or 12 parameters to the diff command, which does not accept them. You will need to write a script around, which will take the right parameters and pass them to your diff command.

I use the svndiffwrapper script from [1] with diff (2.8.1-12ubuntu1) and kdiff3 (0.9.92-1ubuntu1) without problems.

Hth,

Nick S.

[1] www.yolinux.com/TUTORIALS/Subversion.html


-----Original Message-----
From: Kota, Sreenivasa ShravanaKumar [mailto:shravanakumar.ks@hp.com]
Sent: Tue 2/19/2008 08:01
To: users@subversion.tigris.org
Subject:  Svn diff 
 
Users,

I would like to use svn diff with the following options

--diff-cmd /usr/bin/diff
-r 2145

Is it possible to pass both the arguments to svn diff ?

I am getting the following error.

Svn diff -r 2145 --diff-cmd /usr/bin/diff 2.x


Index: 2.x
===================================================================
/usr/bin/diff: illegal option -- u
        usage: diff [ -C n ] [ -S name ] [ -bcefhilnrstw ] dir1 dir2
                diff [-C n ] [ -bcefhintw ] file1 file2
                diff [ -D string ] [ -biw ] file1 file2
svn: '/usr/bin/diff' returned 2


Any hints on how to use revision and external diff command in svn diff command ?


Thanks & Regards,
Shravana Kumar