From yar@comp.chem.msu.su  Wed May 19 05:45:03 2004
Return-Path: <yar@comp.chem.msu.su>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9123916A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 May 2004 05:45:03 -0700 (PDT)
Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5D77D43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 May 2004 05:45:02 -0700 (PDT)
	(envelope-from yar@comp.chem.msu.su)
Received: from comp.chem.msu.su (localhost [127.0.0.1])
	by comp.chem.msu.su (8.12.9p2/8.12.9) with ESMTP id i4JCil3F031941
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 May 2004 16:44:47 +0400 (MSD)
	(envelope-from yar@comp.chem.msu.su)
Received: (from yar@localhost)
	by comp.chem.msu.su (8.12.9p2/8.12.9/Submit) id i4JCikBZ031940
	for FreeBSD-gnats-submit@freebsd.org; Wed, 19 May 2004 16:44:47 +0400 (MSD)
	(envelope-from yar)
Received: from bsd.chem.msu.ru (localhost [127.0.0.1])
	by bsd.chem.msu.ru (8.12.9p2/8.12.9) with ESMTP id i4FM2pRa010961
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 May 2004 02:02:51 +0400 (MSD)
	(envelope-from yar@bsd.chem.msu.ru)
Received: (from yar@localhost)
	by bsd.chem.msu.ru (8.12.9p2/8.12.9/Submit) id i4FM2pW3010960;
	Sun, 16 May 2004 02:02:51 +0400 (MSD)
	(envelope-from yar)
Message-Id: <200405152202.i4FM2pW3010960@bsd.chem.msu.ru>
Date: Sun, 16 May 2004 02:02:51 +0400 (MSD)
From: Yar Tikhiy <yar@comp.chem.msu.su>
To: FreeBSD-gnats-submit@freebsd.org
Subject: $Id$ strings are a revision behind in cvsweb
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66877
>Category:       bin
>Synopsis:       $Id$ strings are a revision behind in cvsweb
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 19 05:50:29 PDT 2004
>Closed-Date:    Mon Sep 27 11:31:32 GMT 2004
>Last-Modified:  Mon Sep 27 12:50:20 GMT 2004
>Originator:     Yar Tikhiy
>Release:        FreeBSD 4.9-RELEASE-p5 i386
>Organization:
Moscow State University
>Environment:
	Tested with a number of web-browsers.

>Description:
	The information contained in strings expanded from $Id$
	keywords lags a revision behind.  This is observed in HTML
	renditions of files, annotated displays, downloads, and
	diffs at cvsweb.freebsd.org.

>How-To-Repeat:
	Use cvsweb.freebsd.org to examine revisions of files in the
	FreeBSD repository dating back to time when $FreeBSD$ wasn't
	there.

	Just one example:
	http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/netinet/in_pcb.h.diff?r1=1.6&r2=1.7

	===================================================================
	RCS file: /usr/local/www/cvsroot/FreeBSD/src/sys/netinet/in_pcb.h,v
	retrieving revision 1.6
	retrieving revision 1.7
	diff -u -p -r1.6 -r1.7
	--- src/sys/netinet/in_pcb.h	1995/04/09 01:29:19	1.6
	+++ src/sys/netinet/in_pcb.h	1995/04/09 16:46:47	1.7
	@@ -31,11 +31,13 @@
	  * SUCH DAMAGE.
	  *
	  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
	- * $Id: in_pcb.h,v 1.5 1995/03/16 18:14:52 bde Exp $
	+ * $Id: in_pcb.h,v 1.6 1995/04/09 01:29:19 davidg Exp $
	  */

	Note that not only revision numbers are off by 1, but the other
	revision info relates to the previous revisions, too--rev. 1.7
	of the file was actually by jkh etc.
 
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-www->freebsd-bugs 
Responsible-Changed-By: ceri 
Responsible-Changed-When: Mon Sep 27 11:07:41 GMT 2004 
Responsible-Changed-Why:  
This isn't a cvsweb problem; command line cvs does the same thing: 

$ cvs -R diff -u -p -r1.6 -r1.7 src/sys/netinet/in_pcb.h 
Index: src/sys/netinet/in_pcb.h 
=================================================================== 
RCS file: /home/ncvs/src/sys/netinet/in_pcb.h,v 
retrieving revision 1.6 
retrieving revision 1.7 
diff -u -u -p -r1.6 -r1.7 
--- src/sys/netinet/in_pcb.h	9 Apr 1995 01:29:19 -0000	1.6 
+++ src/sys/netinet/in_pcb.h	9 Apr 1995 16:46:47 -0000	1.7 
@@ -31,12 +31,14 @@ 
* SUCH DAMAGE. 
* 
*	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93 
- * $Id: in_pcb.h,v 1.5 1995/03/16 18:14:52 bde Exp $ 
+ * $Id: in_pcb.h,v 1.6 1995/04/09 01:29:19 davidg Exp $ 
*/ 

#ifndef _NETINET_IN_PCB_H_ 
#define _NETINET_IN_PCB_H_ 

+#include <sys/queue.h> 
+ 
/* 
* Common structure pcb for internet protocol implementation. 
* Here are stored pointers to local and foreign host table 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66877 

From: "Simon L. Nielsen" <simon@FreeBSD.org>
To: Ceri Davies <ceri@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: bin/66877: $Id$ strings are a revision behind in cvsweb
Date: Mon, 27 Sep 2004 13:20:48 +0200

 --nFreZHaLTZJo0R7j
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2004.09.27 11:11:13 +0000, Ceri Davies wrote:
 > Synopsis: $Id$ strings are a revision behind in cvsweb
 >=20
 
 > This isn't a cvsweb problem; command line cvs does the same thing:
 >=20
 > $ cvs -R diff -u -p -r1.6 -r1.7 src/sys/netinet/in_pcb.h
 > Index: src/sys/netinet/in_pcb.h
 > =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: /home/ncvs/src/sys/netinet/in_pcb.h,v
 > retrieving revision 1.6
 > retrieving revision 1.7
 > diff -u -u -p -r1.6 -r1.7
 > --- src/sys/netinet/in_pcb.h	9 Apr 1995 01:29:19 -0000	1.6
 > +++ src/sys/netinet/in_pcb.h	9 Apr 1995 16:46:47 -0000	1.7
 > @@ -31,12 +31,14 @@
 >   * SUCH DAMAGE.
 >   *
 >   *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
 > - * $Id: in_pcb.h,v 1.5 1995/03/16 18:14:52 bde Exp $
 > + * $Id: in_pcb.h,v 1.6 1995/04/09 01:29:19 davidg Exp $
 
 Well, this is actually correct.  The reason is that the FreeBSD CVS
 repository now only expands $FreeBSD$ when extracting, nothing else.
 
 What you see above is actually the real commit.  When 1.7 was
 committed the Id line from 1.6 (which was of course in the committers
 local file) was actually committed into CVS like any other change.  I
 think more recent versions of CVS has changed that so the keyword
 expansions are not actually commited in.
 
 If you look at the actual ,v file in the repostiory it has:
 
 1.7
 log
 @#include <sys/queue.h> or die horribly.
 @
 text
 @d34 1
 a34 1
  * $Id: in_pcb.h,v 1.6 1995/04/09 01:29:19 davidg Exp $
 a38 2
 
 #include <sys/queue.h>
 @
 
 I don't really think there is a way to "fix" this, since that would
 require some magic to tell CVS when it should expand $Id$ and when it
 should not.
 
 --=20
 Simon L. Nielsen
 FreeBSD Documentation Team
 
 --nFreZHaLTZJo0R7j
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (FreeBSD)
 
 iD8DBQFBV/ePh9pcDSc1mlERAsJ0AKCRQ432tVNOJU1AJ7cNhuSjI7j8AwCcD4cB
 GYT2lWrJvvlOtGHMcM9z4Zw=
 =n0gr
 -----END PGP SIGNATURE-----
 
 --nFreZHaLTZJo0R7j--
State-Changed-From-To: open->closed 
State-Changed-By: ceri 
State-Changed-When: Mon Sep 27 11:30:40 GMT 2004 
State-Changed-Why:  
Simon's explanation works for me; this is not keyword expansion per se, 
it's the *actual delta* that is being shown. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66877 

From: Ruslan Ermilov <ru@freebsd.org>
To: Ceri Davies <ceri@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: bin/66877: $Id$ strings are a revision behind in cvsweb
Date: Mon, 27 Sep 2004 15:40:27 +0300

 On Mon, Sep 27, 2004 at 11:11:13AM +0000, Ceri Davies wrote:
 > This isn't a cvsweb problem; command line cvs does the same thing:
 > 
 > $ cvs -R diff -u -p -r1.6 -r1.7 src/sys/netinet/in_pcb.h
 > Index: src/sys/netinet/in_pcb.h
 > ===================================================================
 > RCS file: /home/ncvs/src/sys/netinet/in_pcb.h,v
 > retrieving revision 1.6
 > retrieving revision 1.7
 > diff -u -u -p -r1.6 -r1.7
 > --- src/sys/netinet/in_pcb.h	9 Apr 1995 01:29:19 -0000	1.6
 > +++ src/sys/netinet/in_pcb.h	9 Apr 1995 16:46:47 -0000	1.7
 > @@ -31,12 +31,14 @@
 >   * SUCH DAMAGE.
 >   *
 >   *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
 > - * $Id: in_pcb.h,v 1.5 1995/03/16 18:14:52 bde Exp $
 > + * $Id: in_pcb.h,v 1.6 1995/04/09 01:29:19 davidg Exp $
 >   */
 >  
 >  #ifndef _NETINET_IN_PCB_H_
 >  #define _NETINET_IN_PCB_H_
 >  
 > +#include <sys/queue.h>
 > +
 >  /*
 >   * Common structure pcb for internet protocol implementation.
 >   * Here are stored pointers to local and foreign host table
 > 
 Indeed.
 
 This is because $Id$'s are updated on checkout, and FreeBSD no
 longer uses $Id$ for its internal purpose -- we use $FreeBSD$
 instead.  Moreover, our CVSROOT scripts will record un-expanded
 version of the tag ($FreeBSD$).
 
 For $Id$'s, you'll get what you see because it's what's actually
 stored in the repo, i.e., $Id$ are no longer expanded in FreeBSD.
 
 
 Cheers,
 -- 
 Ruslan Ermilov
 ru@FreeBSD.org
 FreeBSD committer
>Unformatted:
