Re: cvs commit: src/test/test README

[YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>]

On Thu, Dec 27, 2007 at 01:18:28PM -0800, Matthew Dillon wrote:
> 
> :> :> + * $DragonFly: src/usr.bin/truss/i386-fbsd.c,v 1.3 2003/11/04 15:34:41
> :> :> eirikn Exp $
> :> :
> :> :Do you think I did something wrong?
> :>
> :>     What's weird about them?
> :
> :Should the cvs keyword stuff appear in the diff in the first place?
> :(I checked a few other commit logs and it doesn't there).
> :
> :I committed v1.4 but the '+' line refers to 1.3.
> 
>     I'm not sure why the cvsweb reference is wrong, but the actual diff 
>     1.3 -> 1.4 is correct when I run cvs diff manually:
> 
> * $FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.7.2.2 2001/10/29 20:12:56 des Exp $
> - * $DragonFly: src/usr.bin/truss/i386-fbsd.c,v 1.3 2003/11/04 15:34:41 eirikn Exp $
> + * $DragonFly: src/usr.bin/truss/i386-fbsd.c,v 1.4 2007/12/27 00:59:25 nth Exp $
>   */
> 
>     The actual diffs do include the keyword stuff.  I think there is a way
>     to remove it but I forget exactly how.

That's because cvs takes care of expanding the keyword for you when you
check out or update the file.  The underlying RCS file contains the old
one:
$ rcsdiff -u -r1.{3,4} src/usr.bin/truss/i386-fbsd.c,v
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.7.2.2 2001/10/29 20:12:56 des Exp $
- * $DragonFly$
+ * $DragonFly: src/usr.bin/truss/i386-fbsd.c,v 1.3 2003/11/04 15:34:41 eirikn Exp $

IIRC cvsweb uses rcsdiff program to get the diff, so it's picking up the
wrong keyword, because it doesn't know about the $DragonFly$ keyword.
Usually, a perl script named commit_prep.pl in CVSROOT directory replaces
the keyword to $DragonFly$ (on your machine, not on the CVS server) before
the files get committed, but it seems it didn't work.

By the way, the perl scripts in CVSROOT directory still have the shbang
line pointing to /usr/local/bin/perl, is there a reason they shouldn't be
changed to /usr/pkg/bin/perl?

Cheers.