From charon@labs.gr  Fri Sep  7 15:30:29 2001
Return-Path: <charon@labs.gr>
Received: from mailsrv.otenet.gr (mailsrv.otenet.gr [195.170.0.5])
	by hub.freebsd.org (Postfix) with ESMTP id 7C57437B407
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Sep 2001 15:30:27 -0700 (PDT)
Received: from hades.hell.gr (patr530-b096.otenet.gr [195.167.121.224])
	by mailsrv.otenet.gr (8.11.5/8.11.5) with ESMTP id f87MUNA16383
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 8 Sep 2001 01:30:23 +0300 (EEST)
Received: (from charon@localhost)
	by hades.hell.gr (8.11.6/8.11.6) id f87Ljqe13039;
	Sat, 8 Sep 2001 00:45:52 +0300 (EEST)
	(envelope-from charon)
Message-Id: <200109072145.f87Ljqe13039@hades.hell.gr>
Date: Sat, 8 Sep 2001 00:45:52 +0300 (EEST)
From: Giorgos Keramidas <charon@labs.gr>
Reply-To: Giorgos Keramidas <charon@labs.gr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: CVSROOT/modules has mistakenly single-line comments in some module-aliases
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         30423
>Category:       misc
>Synopsis:       CVSROOT/modules has mistakenly single-line comments in some module-aliases
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 07 15:40:01 PDT 2001
>Closed-Date:    Sat Sep 15 09:17:13 PDT 2001
>Last-Modified:  Sat Sep 15 09:17:44 PDT 2001
>Originator:     Giorgos Keramidas
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hades.hell.gr 5.0-CURRENT FreeBSD 5.0-CURRENT #5: Tue Sep 4 19:49:44 EEST 2001 root@hades.hell.gr:/usr/obj/usr/src/sys/CHARON i386

>Description:

	When using 'cvs co -c' on /home/ncvs (my local CVS mirror), I
	saw that a few lines were not actual module aliases, but plain
	empty lines, starting with whitespace and '#' characters.

	Looking at CVSROOT/modules, I found lines like:

	--------------------------------------------------------------
	bsd_apropos	src/usr.bin/apropos	#deleted files
	--------------------------------------------------------------

	The info page of CVS includes a detailed description of
	'module options' that can go after the module name in a line,
	but does not mention 'single line comments'.  It only mentions
	'comment lines' in the following context (in the section:
	Top -> Administrative files -> modules).

	    The `modules' file may contain blank lines and comments
	    (lines beginning with `#') as well as module definitions.

>How-To-Repeat:

	The lines that include 'single line comments' in
	CVSROOT/modules cause 'cvs co -c' to list fake module entries
	like the ones shown below:

	    % cvs -R -d /home/ncvs co -c | grep '^[^a-zA-Z0-9]'
			#deleted files
			...

	This is obviously not a real module in the repository.
	And it is not a comment line either.

>Fix:

	The attached patch removes the comments from those lines of
	CVSROOT/modules that contain such comment-like parts.

	Of course, instead of removing these lines altogether, one
	might prefer to move them `above' the relevant module lines.

--- patch.diff begins here ---
Index: modules
===================================================================
RCS file: /home/ncvs/CVSROOT/modules,v
retrieving revision 1.3817
diff -u -u -r1.3817 modules
--- modules	6 Sep 2001 22:39:22 -0000	1.3817
+++ modules	7 Sep 2001 21:35:43 -0000
@@ -534,15 +534,15 @@
 brouted		ports/net/brouted
 brs		ports/misc/brs
 bs		src/games/bs
-bsd_apropos	src/usr.bin/apropos	#deleted files
-bsd_diff	src/usr.bin/diff	#just man pages
-bsd_grep	src/usr.bin/grep	#appears to be just egrep?
-bsd_ld		src/usr.bin/ld		#deleted files
-bsd_man		src/usr.bin/man		#deleted files
-bsd_patch	src/usr.bin/patch	#deleted obsolete files
-bsd_sort	src/usr.bin/sort	#just man pages
+bsd_apropos	src/usr.bin/apropos
+bsd_diff	src/usr.bin/diff
+bsd_grep	src/usr.bin/grep
+bsd_ld		src/usr.bin/ld
+bsd_man		src/usr.bin/man
+bsd_patch	src/usr.bin/patch
+bsd_sort	src/usr.bin/sort
 bsd_uucp	src/usr.bin/uucp
-bsd_whatis	src/usr.bin/whatis	#deleted files
+bsd_whatis	src/usr.bin/whatis
 bsdi-netscape47-communicator	ports/www/bsdi-netscape47-communicator
 bsdi-netscape47-navigator	ports/www/bsdi-netscape47-navigator
 bsmtp		ports/mail/bsmtp
@@ -1924,7 +1924,7 @@
 gzip		src/gnu/usr.bin/gzip
 h2n		ports/net/h2n
 ha		ports/archivers/ha
-hack		src/games/hack		#should be replaced by nethack!
+hack		src/games/hack
 hagelslag	ports/net/hagelslag
 halflifeserver	ports/games/halflifeserver
 handbook	doc/en_US.ISO8859-1/books/handbook
--- patch.diff ends here ---
>Release-Note:
>Audit-Trail:

From: Dima Dorfman <dima@unixfreak.org>
To: Giorgos Keramidas <charon@labs.gr>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: misc/30423: CVSROOT/modules has mistakenly single-line comments in some module-aliases 
Date: Mon, 10 Sep 2001 04:08:15 -0700

 Giorgos Keramidas <charon@labs.gr> wrote:
 > >Fix:
 > 
 > 	The attached patch removes the comments from those lines of
 > 	CVSROOT/modules that contain such comment-like parts.
 > 
 > 	Of course, instead of removing these lines altogether, one
 > 	might prefer to move them `above' the relevant module lines.
 
 This would probably be best.  Actually, it'd probably be best if cvs
 unsmoked its crack and allowed comments there, but I don't think
 anybody wants to touch cvs any more than they have to :-).

From: Giorgos Keramidas <charon@labs.gr>
To: Dima Dorfman <dima@unixfreak.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: misc/30423: CVSROOT/modules has mistakenly single-line comments in some module-aliases
Date: Mon, 10 Sep 2001 21:35:10 +0300

 Dima Dorfman <dima@unixfreak.org> wrote:
 
 > Giorgos Keramidas <charon@labs.gr> wrote:
 > > 	Of course, instead of removing these lines altogether, one
 > > 	might prefer to move them `above' the relevant module lines.
 > 
 > This would probably be best.  Actually, it'd probably be best if cvs
 > unsmoked its crack and allowed comments there, but I don't think
 > anybody wants to touch cvs any more than they have to :-).
 
 I chose to entirely remove these comments because converting them to
 have the comments above the lines they refer to breaks the
 sorted-alphabetically style of the rest of those modules.  Anyways, if
 you want me to prepare a patch that moves the comment-lines above
 those that they currently break, I can prepare one very easily.
 
 Let's see.  The 'we should have CVS support this' option has to go
 through the CVS developers list.  I will contact them, and if they
 think this is a relatively useful thing to include in their next CVS
 release, and I or one of them comes up with the proper diffs, I will
 follow-up on this PR with the outcome of the discussion.
 
 -giorgos
State-Changed-From-To: open->closed 
State-Changed-By: dd 
State-Changed-When: Sat Sep 15 09:17:13 PDT 2001 
State-Changed-Why:  
Patch applied, but it would still be nice if cvs would grow the 
ability to handle comments where they were. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=30423 
>Unformatted:
