[Don't know much about SCCS, nor have I looked closely enough, to
comment on this patch.

-kingdon]

Date: Mon, 10 Feb 1997 12:19:58 -0500
From: jmm@revenge.elegant.com (John Macdonald)
To: bug-cvs@prep.ai.mit.edu
Subject: small extensions to sccs2rcs.csh

>Submitter-Id:   net
>Originator: 	 John Macdonald
>Organization: net
>Confidential: no
>Synopsis: sccs2rcs does not convert all sccs keyword codes or record sccs MR info
>Severity: non-critical
>Priority: low
>Category: contrib
>Class:	change-request
>Release:	cvs-1.9
>Environment:
RS/6000, AIX 4.1
System: AIX revenge 1 4 000021277600


>Description:
	Converting SCCS files did not convert all of the keywords
	that were present in our files.  (Most of the keywords
	that were not handled were ones that we weren't actually
	using.

	The MR info that we had collected was being discarded.
>How-To-Repeat:
	
>Fix:
	
	The following patch worked better for me...

Index: sccs2rcs.csh
===================================================================
RCS file: /home/xrsa/src/cvs/contrib/sccs2rcs.csh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sccs2rcs.csh	1996/10/08 18:44:29	1.1.1.1
+++ sccs2rcs.csh	1996/10/08 18:50:01	1.2
@@ -43,7 +43,7 @@
 #
 # Various hacks made by Brian Berliner before inclusion in CVS contrib area.
 #
-# $Id: sccs-mac.txt,v 1.1.1.1 2001/04/14 00:10:26 dprice Exp $
+# $Id: sccs-mac.txt,v 1.1.1.1 2001/04/14 00:10:26 dprice Exp $
 
 
 #we'll assume the user set up the path correctly
@@ -103,10 +103,13 @@
     '%M%[ 	]*%I%[ 	]*%G%'\
     '%M%[ 	]*%I%[ 	]*%E%'\
     '%M%'\
+    '%Z%'\
     '%I%'\
     '%G%'\
     '%E%'\
-    '%U%')
+    '%U%'\
+    '%Y%'\
+    '%Q%')
 set rcs_keywords = (\
     '$'Id'$'\
     '$'Id'$'\
@@ -116,9 +119,12 @@
     '$'Id'$'\
     '$'Id'$'\
     '$'RCSfile'$'\
+    '@(#)'\
     '$'Revision'$'\
     '$'Date'$'\
     '$'Date'$'\
+    ''\
+    ''\
     '')
 
 
@@ -222,15 +228,25 @@
                 if ($status != 0) goto ERROR
 	    endif
             echo got lock
-            sccs prs -r$rev $file | grep "." > $tmpfile
-            # it's OK if grep fails here and gives status == 1
+            sccs prs -d':C:' -r$rev $file > $tmpfile
             # put the delta message in $tmpfile
-            ed $tmpfile >>& $logfile <<EOF
-/COMMENTS
-1,.d
+	    # trim the trailing blank line
+            ed $tmpfile >>& $logfile <<'EOF'
+$g/^$/d
+w
+q
+'EOF'
+	    # check for MR codes to preserve
+	    set mrlist = ( `sccs prs -d':MR:' -r$rev $file` )
+	    if ($#mrlist) then
+		ed $tmpfile >>& $logfile <<EOF
+0a
+MRs:	$mrlist
+.
 w
 q
 EOF
+	    endif
             ci -f -r$rev -d"$date" -w$author $file < $tmpfile >>& $logfile
             if ($status != 0) goto ERROR
             echo checked into RCS