Re: cvs commit: src/test/test README

Previous thread: cvs commit: src/etc rc.suspend rc.resume by Matthias Schmidt on Thursday, December 27, 2007 - 1:00 pm. (1 message)

Next thread: cvs commit: src/test/test README by Sascha Wildner on Thursday, December 27, 2007 - 4:52 pm. (1 message)
From: Matthew Dillon
Date: Thursday, December 27, 2007 - 2:18 pm

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.

					-Matt
					Matthew Dillon 
					<dillon@backplane.com>
From: Nicolas Thery
Date: Thursday, December 27, 2007 - 2:39 pm

Thanks.  I'll check if it happens again in my next commit.
From: YONETANI Tomokazu
Date: Thursday, December 27, 2007 - 4:22 pm

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.
From: Sascha Wildner
Date: Friday, December 28, 2007 - 2:40 am

Hmm,

are you implying that I can't commit without having perl installed?

Sascha

-- 
http://yoyodyne.ath.cx
From: YONETANI Tomokazu
Date: Friday, December 28, 2007 - 6:19 am

I was, because my local test was simply wrong and it led me to a wrong
conclusion.  Sorry about the confusion.
Previous thread: cvs commit: src/etc rc.suspend rc.resume by Matthias Schmidt on Thursday, December 27, 2007 - 1:00 pm. (1 message)

Next thread: cvs commit: src/test/test README by Sascha Wildner on Thursday, December 27, 2007 - 4:52 pm. (1 message)