Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Feb 2001 09:53:50 -0800
From:      Peter Wemm <peter@netplex.com.au>
To:        Jeroen Ruigrok/Asmodai <asmodai@wxs.nl>
Cc:        Maxim Sobolev <sobomax@freebsd.org>, cvs-committers@freebsd.org, cvs-all@freebsd.org, cvs@freebsd.org
Subject:   Re: Strange commit statistics misbehaviour [Re: cvs commit: ports/audio/pysol-sound-server Makefile ports/audio/sdl_mixer] 
Message-ID:  <200102171753.f1HHror36843@mobile.wemm.org>
In-Reply-To: <20010217163256.B53437@daemon.ninth-circle.org> 

next in thread | previous in thread | raw e-mail | index | archive | help
Jeroen Ruigrok/Asmodai wrote:
> -On [20010216 21:30], Maxim Sobolev (sobomax@freebsd.org) wrote:
> >>   1.10      +1 -1      ports/graphics/xmps/Makefile
> >	      ^^^^^
> >Could someone explain why the last line differs from all previous? The chang
    e
> >in question was exactly the same and cvs diff indicates that two lines had
> >been changed (LIB_DEPENDS and $FreeBSD$).
> >
> >For example compare:
> >http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/smpeg/Makefile.diff?r1=
    1.13&r2=1.14
> >http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/xmps/Makefile.diff?r1=1
    .9&r2=1.10
> 
> Maybe a problem in the log_accum.pl?
> 
> Otherwise we could also have a problem in CVS.
> 
> I would be inclined to think the perl scripts since CVS contains the
> correct info, and CVS doesn't do anything with the scripts, those are
> external.

The perl scripts just parse the output of rcs/cvs log.  If rcs says +1 -1
then that is what we report:
----------------------------
revision 1.10
date: 2001/02/16 19:48:10;  author: sobomax;  state: Exp;  lines: +1 -1
Update SDL shared library version number.
----------------------------

In the Makefile,v file:
text
@# New ports collection makefile for:   xmps
# Date created:                         15 June 2000
# Whom:                                 Maxim Sobolev <sobomax@@FreeBSD.org>
#
# $FreeBSD$
#
....

and the delta to the old revision is stored as:

text
@d15 1
a15 1
LIB_DEPENDS=    SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
@

Remember, $FreeBSD$ is expanded on *checkout*.  If you delete or mangle the
version info, that is what gets checked in.  If you commit another version
with the same deleted or mangled version info then there is no change to
the line with the tag.

I have been tempted on a few occasions to try and convert the tags to the
canonical "$FreeBSD$" form as the last stage of the commit checks in order
to avoid the usual extra line in the repository.

Cheers,
-Peter
--
Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au
"All of this is for nothing if we don't go to the stars" - JMS/B5



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




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