Skip site navigation (1)Skip section navigation (2)
Date:      28 Jul 2003 21:32:00 +0300
From:      Ville =?ISO-8859-1?Q?Skytt=E4?= <scop@FreeBSD.org>
To:        freebsd-cvsweb@FreeBSD.org
Subject:   Re: diff and tarball issues
Message-ID:  <1059417120.23194.103.camel@bobcat.mine.nu>
In-Reply-To: <E36E0C5C92D97049B4855B5498A945470CB897@weshml02.winbond.com.tw>
References:  <E36E0C5C92D97049B4855B5498A945470CB897@weshml02.winbond.com.tw>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 2003-06-18 at 04:23, PC32 XHChen wrote:

> 	The problem may be fixed by adding a "chdir" before "system" function in perl cgi,
> 	since "cvs co -d" can not specify sub-directories.  I'm not sure...
[...]
> >  I got the same error when I use cvsweb. And the following 
> > difference was found:
> > 
> > 	cvs co -d test ModulePath
> > 		(OK)
> >
> > 	cvs co -d testdir/test ModulePath
> > 		(ERROR)
> > 		cvs co failure: No such file or directory:

What version of cvs is this?  (cvs --version)

Does it work if you create "testdir" before running the latter command?

> > When clicking A unified diff 'diff' for a given file, I get:
> > 
> > RCS file: /home/tkralidi/cvsroot/owsview/blank.html,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -p -r1.1 -r1.2
> > /bin/diff: illegal option -- u
> > usage: diff [-bitw] [-c | -e | -f | -h | -n] file1 file2
> >        diff [-bitw] [-C number] file1 file2
> >        diff [-bitw] [-D string] file1 file2
> >        diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S name]
> > directory1 directory2
> > rcsdiff: /home/tkralidi/cvsroot/owsview/blank.html: diff failed

I suggest that you either:

* Install GNU diff (in the diffutils package) and make your setup use 
  it (ie. rcsdiff(1) should run the GNU one instead of the one in /bin).

* Or modify cvsweb.cgi, commenting out the @DIFFTYPES that your diff(1) 
  doesn't grok, and change the default to a supported in cvsweb.conf
  (%DEFAULTVALUE).

HTH,
-- 
\/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1059417120.23194.103.camel>