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

Re: GNU diff or not GNU diff, that is the question...

From: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2002-04-11 17:44:20 CEST

On Thu, Apr 11, 2002 at 10:17:03AM -0500, cmpilato@collab.net wrote:
> Marcus Comstedt <marcus@mc.pp.se> writes:
>
> > START: diff_tests.py
> > ['/usr/bin/diff: illegal option -- u\n', 'usage: diff [-bitw] [-c | -e | -f | -h | -n] file1 file2\n', ' diff [-bitw] [-C number] file1 file2\n', ' diff [-bitw] [-D string] file1 file2\n', '
> > diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S name] directory1 directory2\n']
> > FAIL: diff_tests.py 1: update a file
> >
> > etc etc. There are two possible solutions
> >
> > 1) If svn diff really needs GNU diff, then it should run GNU diff
> > (gdiff on my system) and not any old /usr/bin/diff.
> >
> > 2) If svn diff doesn't really need GNU diff, then it should not assume
> > GNU diff by using the -u flag without checking first.
>
> We *do* require GNU diff, and `configure' should be testing that you
> have such. Wonder what's going on...

Maybe sussman remembers better, but what I thought happened was that when we
switched to using diff3, we decided that we still needed gnu diff (since diff3
runs it under the hood), but we could you any diff for svn diff. Hence the
problem.

I think we are on the right track and what is needed is a removal of the -u
passed to to diff, and a way to specify in ~/.subversion/options to pass
-X"-u" to svn diff by default.

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Thu Apr 11 17:50:05 2002

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