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

Re: --diff-cmd question

From: Jan Hendrik <jan.hendrik_at_bigfoot.com>
Date: 2003-09-20 17:37:59 CEST

Sorry, not Tigris got hungry, I mis-posted this to the dev@ list.

Concerning Re: --diff-cmd question
Philip Martin wrote on 19 Sep 2003, 15:27, at least in part:

> "Jan Hendrik" <jan.hendrik@bigfoot.com> writes:
> > Trying to use ExamDiff with the --diff-cmd I get the following
> > error:
> Is ExamDiff some well known Windows program? Does it accept command
> line arguments similar to GNU diff? You may have to use a wrapper
> program or script to convert the GNU style arguments to a form
> acceptable to ExamDiff.

It is a Windows program, if well-known I do not know, but it was
mentioned for TSVN.

It takes the command line [Filename1] [Filename2] [Options].
Options are concerned with considering white spaces etc.

I tried Winmerge (of Sourceforge) now, too, and it works - sort of: it
ignores the filename and shows a directory listing. Not what I want.
If invoked with filenames it shows the file, not the folder. In TSVN it
has worked just as ExamDiff.

Testing further by giving svn diff the filename in two different working
copies Winmerge comes up with *two* windows and I now see it
compares each folder (not the file) against itself.

Next I took WinDiff. It just gives me a list of unrelated command
line options. It should be invoked with either one or two files. In the
first case it should compare the file with, say, -r BASE. There is no
difference if both filenames are handed over.

GNU Diff works. So it seems none of the Windows tools takes the
parameters in the GNU/DOS style and TSVN makes wrappers for

Jan Hendrik

> > D:\>svn diff -r BASE --diff-cmd d:\tmp\examdiff\examdiff.exe
> > d:\tmp\testworkcopy
> > \ridinger\niemeyer\prints\index.htm
> > Index: D:/Tmp/TestWorkCopy/Ridinger/niemeyer/prints/index.htm
> > =================================================
> > ==================
> > svn: Error calling external program
> > svn: svn_io_run_cmd: error exitwhy 2 for process
> > 'd:\tmp\examdiff\examdiff.exe'
> The external diff program exited with a return value of 2. Subversion
> expects the program to return 0 or 1. You may have to use the wrapper
> program or script to convert the ExamDiff return value.
> I don't know what an ExamDiff return value of 2 means but I'd guess it
> indicates that the program failed, possibly because it doesn't
> understand GNU diff style command line arguments.
> --
> Philip Martin
Freedom quote:

     The house we hope to build
     is not for my generation but for yours.
     It is your future that matters.
     And I hope that when you are my age,
     you will be able to say as I have been able to say:
     We lived in freedom.
     We lived lives that were a statement, not an apology.
                -- Ronald Reagan

Mailed with Pegasus Mail 3.12c (32bit).
Never heard of it?
Easy to use, full featured - and freely available.
And *no* automatic virus activation and spreading.
Take a look at http://www.pmail.com
Give it a try - and you'll never miss anything else.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Sep 20 17:35:37 2003

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.