From owner-freebsd-cvsweb@FreeBSD.ORG Wed Sep 17 10:43:22 2003 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3967016A4BF for ; Wed, 17 Sep 2003 10:43:22 -0700 (PDT) Received: from smtp3.pp.htv.fi (smtp3.pp.htv.fi [213.243.153.138]) by mx1.FreeBSD.org (Postfix) with ESMTP id 413FC43FAF for ; Wed, 17 Sep 2003 10:43:21 -0700 (PDT) (envelope-from scop@FreeBSD.org) Received: from posti.pp.htv.fi (posti.pp.htv.fi [212.90.64.50]) by smtp3.pp.htv.fi (Postfix) with ESMTP id 21DE927B044 for ; Wed, 17 Sep 2003 20:43:20 +0300 (EEST) Received: from cs78130147.pp.htv.fi (cs78130147.pp.htv.fi [62.78.130.147]) by posti.pp.htv.fi (8.11.1/8.11.1) with ESMTP id h8HHhJ515155 for ; Wed, 17 Sep 2003 20:43:19 +0300 (EETDST) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@FreeBSD.org In-Reply-To: References: Content-Type: text/plain Organization: FreeBSD Message-Id: <1063820598.31725.43.camel@bobcat.mine.nu> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.4 (1.4.4-0.vs.2) Date: Wed, 17 Sep 2003 20:43:19 +0300 Content-Transfer-Encoding: 7bit Subject: Re: Version numbers and diifs not being displayed X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list [restricted posting] List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2003 17:43:22 -0000 On Wed, 2003-09-17 at 16:28, carol.kirkpatrick@radianz.com wrote: > Hi, Hi Carol, be sure to use freebsd-cvsweb@, not owner-freebsd-cvsweb@ as the list address. > I have installed the GNU difftools and have been able to get the > differences to be displayed, but not the version. I insert a statement to > print the header information out to web server error log as suggested in a > previous email and the results are listed below. Any ideas? > > diff: '===================================================================' > diff: 'RCS file: /opt/cvsroot/Hosting/Scripts/techtool_archive.pl,v, ' > diff: 'retrieving revision 1.1 ' > diff: 'retrieving revision 1.2 ' > diff: 'diff -u -r1.1 -r1.2' > diff: '--- /tmp/T0.MaaVr 2003-09-17 12:56:38.591968289 +0000 ' > diff: '+++ /tmp/T1_MaaVr 2003-09-17 12:56:38.601971639 +0000 ' Hmm. Do you get the same rcsdiff headers (ie: a weird trailing comma in the "RCS file:" line, /tmp/something instead of the real filename, and no versions) if you run rcsdiff -u -r1.1 -r1.2 /opt/cvsroot/Hosting/Scripts/techtool_archive.pl,v from the command line, as the user running the cvsweb.cgi script? What about the same without the ,v suffix? I tried to reproduce on a Solaris 8 box but the output was always as I expected, ie. something like: % rcsdiff -u -r1.1 -r1.2 `pwd`/foo/foo/bar,v =================================================================== RCS file: /m/fs/user1/a/18/scop/foo/foo/bar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bar 2003/09/17 17:19:03 1.1 +++ bar 2003/09/17 17:19:15 1.2 ...or if I run it without the trailing ,v: % rcsdiff -u -r1.1 -r1.2 `pwd`/foo/foo/bar =================================================================== RCS file: /m/fs/user1/a/18/scop/foo/foo/bar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /m/fs/user1/a/18/scop/foo/foo/bar 2003/09/17 17:32:50 1.1 +++ /m/fs/user1/a/18/scop/foo/foo/bar 2003/09/17 17:33:23 1.2