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

Re: diff with --diff-cmd errors out

From: Greg Franks <rgfranks_at_alumni.uwaterloo.ca>
Date: 2005-06-25 05:24:19 CEST

>>>>> "Michael" == Michael L Brown <michael.l.brown@philips.com> writes:

    Michael> I get an error when trying to do the following:
    Michael> soldev57.ZCURR <148> svn diff --diff-cmd /usr/bin/diff -x
    Michael> "-C 1" ReleaseFileList
    Michael> Index: ReleaseFileList
    Michael> ===================================================================
    Michael> /usr/bin/diff: illegal option -- L usage: diff [-bitw]
    Michael> [-c | -e | -f | -h | -n] file1 file2 diff [-bitw] [-C
    Michael> number] file1 file2 diff [-bitw] [-D string] file1 file2
    Michael> diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S
    Michael> name] directory1 directory2 svn: '/usr/bin/diff' returned
    Michael> 2

    Michael> I personally prefer context diffs and tried to do what
    Michael> the manual suggests, but as you can see from the above,
    Michael> it appears that svn is passing a -L option to diff and it
    Michael> is falling over because of it. Any way to fix that?

Install the GNU version of diff. It has context diffs and supports -L.

   __@               Greg Franks              <|       _~@ __O 
 _`\<,_         Ottawa, Ontario, Canada        |O\   -^\<;^\<, 
(*)/ (*)                                       (*)--(*)%---/(*)
          "Where do you want to go today?"   Outside.  
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 25 05:26:11 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.