Date: Thu, 18 Sep 2003 14:19:49 -0400 From: carol.kirkpatrick@radianz.com To: scop@FreeBSD.org Cc: owner-freebsd-cvsweb@freebsd.org Subject: Re: Version numbers and diifs not being displayed Message-ID: <OFCD0501F8.85E351AC-ON85256DA5.00646FF3@radianz.com>
next in thread | raw e-mail | index | archive | help
Ville,
I have included the output from the version and greps below.
I downloaded the tools from GNU and compiled them myself.
I agree about the hack. I would prefer to use cvsweb.cgi in the normal=
config.
Thanks again for your help.
# rcsdiff -r1.1 -r1.2 --version techtool_archive.pl,v
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: techtool_archive.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff --version -r1.1 -r1.2
diff (GNU diffutils) 2.8.1
Copyright (C) 2002 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
Written by Paul Eggert, Mike Haertel, David Hayes,
Richard Stallman, and Len Tower.
# strings /usr/local/bin/rcsdiff | grep /diff
/usr/bin/diff
# strings /usr/local/bin/rcsdiff | grep Id
$Id: rcsbase.h,v 5.20 1995/06/16 06:19:24 eggert Exp $
$Id: rcsdiff.c,v 5.19 1995/06/16 06:19:24 eggert Exp $
$Id: rcsutil.c,v 5.20 1995/06/16 06:19:24 eggert Exp $
$Id: rcsfnms.c,v 5.16 1995/06/16 06:19:24 eggert Exp $
$Id: rcsmap.c,v 5.3 1995/06/16 06:19:24 eggert Exp $
$Id: rcsrev.c,v 5.10 1995/06/16 06:19:24 eggert Exp $
$Id: rcssyn.c,v 5.15 1995/06/16 06:19:24 eggert Exp $
$Id: rcslex.c,v 5.19 1995/06/16 06:19:24 eggert Exp $
$Id: maketime.c,v 5.11 1995/06/16 06:19:24 eggert Exp $
$Id: partime.c,v 5.13 1995/06/16 06:19:24 eggert Exp $
$Id: rcstime.c,v 1.4 1995/06/16 06:19:24 eggert Exp $
$Id: rcskeep.c,v 5.10 1995/06/16 06:19:24 eggert Exp $
$Id: rcskeys.c,v 5.4 1995/06/16 06:19:24 eggert Exp $
++++++++++++++++++++++++++++
Carol Kirkpatrick,PhD
Senior Applications Engineer
Tel: +973-662-3206
carol.kirkpatrick@radianz.com
Imagination is more important than knowledge. Knowledge is
limited. Imagination encircles the world. - Albert Einstein
++++++++++++++++++++++++++++
=
=20
Ville Skytt=E4 =
=
<scop@FreeBSD.org> To: freebsd-cv=
sweb@FreeBSD.org =20
Sent by: cc: =
=20
owner-freebsd-cvsweb@ Subject: Re: Versio=
n numbers and diifs not being displayed =20
freebsd.org =
=20
=
=20
=
=20
09/18/2003 01:40 PM =
=20
=
=20
=
=20
On Thu, 2003-09-18 at 17:14, carol.kirkpatrick@radianz.com wrote:
> The output is the same (see below). Is there anyway to determine the=
exact
> version of rcsdiff and diff that is being used. I downloaded the too=
ls
> last week. Thanks for your help.
>
> $ rcsdiff -u -r1.1 -r1.2 techtool_archive.pl,v
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: techtool_archive.pl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- /tmp/T0CVaiVx 2003-09-18 14:08:41.433508430 +0000
> +++ /tmp/T1DVaiVx 2003-09-18 14:08:41.443513401 +0000
GNU diff has --version, and the following hack should display the
version of diff that rcsdiff invokes:
rcsdiff -r1.1 -r1.2 --version techtool_archive.pl,v
Additionally, on my RH9 box and FreeBSD 4.9-pre:
$ strings /usr/bin/rcsdiff | grep /diff
/usr/bin/diff
I don't know how to extract the rcs version number from rcsdiff,
"strings /path/to/rcsdiff | grep Id" contains some information.
Where did you download the tools from? Did you compile them yourself?
It's probably possible to add a hac^H^H^Hworkaround for this to
cvsweb.cgi, but I'd like to first verify that it's needed, and under
what conditions.
_______________________________________________
freebsd-cvsweb@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb
To unsubscribe, send any mail to "freebsd-cvsweb-unsubscribe@freebsd.or=
g"
=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?OFCD0501F8.85E351AC-ON85256DA5.00646FF3>