 @@ -2791,49 +2791,51 @@ for what in $tests; do
 	    if test $fromtest = $what ; then
 		unset fromtest
 	    else
 		continue
 	    fi
 	fi
 	case $what in
 	version)
 	  # We've had cases where the version command started dumping core,
 	  # so we might as well test it
 	  dotest version-1 "${testcvs} --version" \
+'
-Concurrent Versions System (CVS) [0-9.]*.*
+Concurrent Versions System (CVS) [0-9.]*.*with CVSACL Patch [0-9.]*.*
 Copyright (C) [0-9]* Free Software Foundation, Inc.
 Senior active maintainers include Larry Jones, Derek R. Price,
 and Mark D. Baushke.  Please see the AUTHORS and README files from the CVS
 distribution kit for a complete list of contributors and copyrights.
 CVS may be copied only under the terms of the GNU General Public License,
 a copy of which can be found with the CVS distribution kit.
 Specify the --help option for further information about CVS'
 # Maybe someday...
 #	  if $proxy; then
 #		dotest version-2r "${testcvs} version" \
 #'Client: Concurrent Versions System (CVS) [0-9p.]* (client.*)
 #Server: Concurrent Versions System (CVS) [0-9p.]* (.*server)
 #Secondary Server: Concurrent Versions System (CVS) [0-9p.]* (.*server)'
 	  if $remote; then
 		dotest version-2r "${testcvs} version" \
 'Client: Concurrent Versions System (CVS) [0-9p.]* (client.*)
-Server: Concurrent Versions System (CVS) [0-9p.]* (.*server)'
+with CVSACL Patch [0-9p.]* (.*)
 Server: Concurrent Versions System (CVS) [0-9p.]* (.*server)
 with CVSACL Patch [0-9p.]* (.*)'
 	  else
 		dotest version-2 "${testcvs} version" \
 'Concurrent Versions System (CVS) [0-9.]*.*'
 	  fi
 	  ;;
 	basica)
 	  # Similar in spirit to some of the basic1, and basic2
 	  # tests, but hopefully a lot faster.  Also tests operating on
 	  # files two directories down *without* operating on the parent dirs.
 @@ -3318,29 +3320,29 @@ ${SPROG} \[admin aborted\]: attempt to d
 	  mkdir 1; cd 1
 	  # Note that -H is an invalid option.
 	  # I suspect that the choice between "illegal" and "invalid"
 	  # depends on the user's environment variables, the phase
 	  # of the moon (weirdness with optind), and who knows what else.
 	  # I've been seeing "illegal"...
 	  # And I switched it to "invalid". -DRP
 	  # POSIX 1003.2 specifies the format should be 'illegal option'
 	  # many other folks are still using the older 'invalid option'
 	  # lib/getopt.c will use POSIX when __posixly_correct
 	  # otherwise the other, so accept both of them. -- mdb
 	  dotest_fail basicb-21 "${testcvs} -q admin -H" \
-"admin: invalid option -- H
+"admin: invalid option -- '*H'*
 ${CPROG} \[admin aborted\]: specify ${CPROG} -H admin for usage information" \
-"admin: illegal option -- H
+"admin: illegal option -- '*H'*
 ${CPROG} \[admin aborted\]: specify ${CPROG} -H admin for usage information"
 	  cd ..
 	  rmdir 1
 	  if $keep; then
 	    echo Keeping ${TESTDIR} and exiting due to --keep
 	    exit 0
 	  fi
 	  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
 			     $CVSROOT_DIRNAME/second-dir
 	  modify_repo rm -f $CVSROOT_DIRNAME/topfile,v
 	  ;;
 @@ -4627,150 +4629,158 @@ ${SPROG} update: Updating dir1/dir2"
 		# \(${TESTDIR}\|<remote>\) is that we are trying to
 		# make this portable.  Perhaps at some point we should
 		# ditch that notion and require GNU expr (or dejagnu or....)
 		# since it seems to be so painful.
 		dotest basic2-64 "${testcvs} his -x TOFWUPCGMAR -a" \
 "O [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir           =first-dir= ${TESTDIR}/\*
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir           == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir           == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir/dir1      == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir/dir1      == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir/dir1/dir2 == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir/dir1/dir2 == ${TESTDIR}
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[second-dive:A\]
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir           == ${TESTDIR}
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir           == ${TESTDIR}
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir           == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir/dir1      == ${TESTDIR}
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir/dir1      == ${TESTDIR}
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir/dir1      == ${TESTDIR}
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir/dir1/dir2 == ${TESTDIR}
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir/dir1/dir2 == ${TESTDIR}
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir/dir1/dir2 == ${TESTDIR}
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[third-dive:A\]
 F [0-9-]* [0-9:]* ${PLUS}0000 ${username}                     =first-dir= ${TESTDIR}/\*
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-head:A\]
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-tag:rtagged-by-head\]
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-revision:1\.1\]
 O [0-9-]* [0-9:]* ${PLUS}0000 ${username} \[1\.1\] first-dir           =first-dir= ${TESTDIR}/\*
 U [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir           == ${TESTDIR}/first-dir
 W [0-9-]* [0-9:]* ${PLUS}0000 ${username}     file7     first-dir           == ${TESTDIR}/first-dir" \
 "O [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir           =first-dir= <remote>/\*
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir           == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir           == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir/dir1      == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir/dir1      == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file6     first-dir/dir1/dir2 == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file7     first-dir/dir1/dir2 == <remote>
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[second-dive:A\]
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir           == <remote>
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir           == <remote>
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir           == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir/dir1      == <remote>
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir/dir1      == <remote>
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir/dir1      == <remote>
 A [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.1 file14    first-dir/dir1/dir2 == <remote>
 M [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir/dir1/dir2 == <remote>
 R [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file7     first-dir/dir1/dir2 == <remote>
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[third-dive:A\]
 F [0-9-]* [0-9:]* ${PLUS}0000 ${username}                     =first-dir= <remote>/\*
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-head:A\]
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-tag:rtagged-by-head\]
 T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-revision:1\.1\]
 O [0-9-]* [0-9:]* ${PLUS}0000 ${username} \[1\.1\] first-dir           =first-dir= <remote>/\*
 P [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6     first-dir           == <remote>
 W [0-9-]* [0-9:]* ${PLUS}0000 ${username}     file7     first-dir           == <remote>"
 	  fi
 	  dokeep
 	  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
 			     $CVSROOT_DIRNAME/second-dir
 	  ;;
 	ls)
 	  # Test the ls & rls commands.  There are some tests of
 	  # Interaction of ls, rls, and branches in branches2.
 	  mkdir ls; cd ls
 	  dotest ls-init-1 "$testcvs -Q co -dtop ."
 	  cd top
 	  dotest ls-1 "$testcvs ls CVSROOT" \
-"checkoutlist
+"aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 taginfo
 verifymsg"
 	  dotest ls-2 "$testcvs ls -R" \
 "\.:
 CVSROOT
 CVSROOT:
 aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 taginfo
 verifymsg"
 	  # This used to cause a fatal error.
 	  modify_repo mkdir $CVSROOT_DIRNAME/notcheckedout
 	  dotest ls-3 "$testcvs ls -RP" \
 "\.:
 CVSROOT
 notcheckedout
 CVSROOT:
 aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 taginfo
 verifymsg"
 	  # Make sure the previous command did not create the notcheckedout
 	  # directory.
 	  dotest_fail ls-4 "test -d notcheckedout"
 	  dotest ls-5 "$testcvs ls -R" \
 "\.:
 CVSROOT
 notcheckedout
 CVSROOT:
 aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 @@ -7499,26 +7509,27 @@ File: file3            	Status: Up-to-da
 	  # Test some calls to rls here because we can.  These should probably
 	  # be somewhere else, but we already have some directories set up.
           dotest branches2-14-rls-1 "$testcvs rls" \
 "$SPROG rls: Listing module: \`.'
 CVSROOT
 first-dir"
           dotest branches2-14-rls-2 "$testcvs rls -R" \
 "$SPROG rls: Listing module: \`.'
 \.:
 CVSROOT
 first-dir
 CVSROOT:
 aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 @@ -7530,26 +7541,27 @@ CVSROOT/Emptydir:
 first-dir:
 file1
 dir1
 first-dir/dir1:"
           dotest branches2-14-rls-3 "$testcvs rls -l -R" \
 "$SPROG rls: Listing module: \`.'
 \.:
 d--- $ISO8601DATE            CVSROOT
 d--- $ISO8601DATE            first-dir
 CVSROOT:
 ---- $ISO8601DATE 1\.[0-9][0-9]*        aclconfig
 ---- $ISO8601DATE 1\.[0-9][0-9]*        checkoutlist
 ---- $ISO8601DATE 1\.[0-9][0-9]*        commitinfo
 ---- $ISO8601DATE 1\.[0-9][0-9]*        config
 ---- $ISO8601DATE 1\.[0-9][0-9]*        cvswrappers
 ---- $ISO8601DATE 1\.[0-9][0-9]*        loginfo
 ---- $ISO8601DATE 1\.[0-9][0-9]*        modules
 ---- $ISO8601DATE 1\.[0-9][0-9]*        notify
 ---- $ISO8601DATE 1\.[0-9][0-9]*        postadmin
 ---- $ISO8601DATE 1\.[0-9][0-9]*        postproxy
 ---- $ISO8601DATE 1\.[0-9][0-9]*        posttag
 ---- $ISO8601DATE 1\.[0-9][0-9]*        postwatch
 ---- $ISO8601DATE 1\.[0-9][0-9]*        preproxy
 ---- $ISO8601DATE 1\.[0-9][0-9]*        rcsinfo
 @@ -7561,26 +7573,27 @@ CVSROOT/Emptydir:
 first-dir:
 ---- $ISO8601DATE 1\.1        file1
 d--- $ISO8601DATE            dir1
 first-dir/dir1:"
           dotest branches2-14-rls-4 "$testcvs rls -eR" \
 "$SPROG rls: Listing module: \`.'
 \.:
 D/CVSROOT////
 D/first-dir////
 CVSROOT:
 /aclconfig/1\.[0-9][0-9]*/$DATE//
 /checkoutlist/1\.[0-9][0-9]*/$DATE//
 /commitinfo/1\.[0-9][0-9]*/$DATE//
 /config/1\.[0-9][0-9]*/$DATE//
 /cvswrappers/1\.[0-9][0-9]*/$DATE//
 /loginfo/1\.[0-9][0-9]*/$DATE//
 /modules/1\.[0-9][0-9]*/$DATE//
 /notify/1\.[0-9][0-9]*/$DATE//
 /postadmin/1\.[0-9][0-9]*/$DATE//
 /postproxy/1\.[0-9][0-9]*/$DATE//
 /posttag/1\.[0-9][0-9]*/$DATE//
 /postwatch/1\.[0-9][0-9]*/$DATE//
 /preproxy/1\.[0-9][0-9]*/$DATE//
 /rcsinfo/1\.[0-9][0-9]*/$DATE//
 @@ -7591,26 +7604,27 @@ D/Emptydir////
 CVSROOT/Emptydir:
 first-dir:
 /file1/1\.1/$DATE//
 D/dir1////
 first-dir/dir1:"
           dotest branches2-14-rls-5 "$testcvs -q rls -R" \
 "\.:
 CVSROOT
 first-dir
 CVSROOT:
 aclconfig
 checkoutlist
 commitinfo
 config
 cvswrappers
 loginfo
 modules
 notify
 postadmin
 postproxy
 posttag
 postwatch
 preproxy
 rcsinfo
 @@ -12191,27 +12205,28 @@ fish"
 	  # CVSROOT/config files are broken.  This is intentional, since it is
 	  # possible and even likely that an administrator might want to set up
 	  # different configurations on the two servers and the paths to the
 	  # config files on the secondary and primary were intentionally left
 	  # intact even though they might be different.
 	  if $noredirect; then
             notnoredirect keywordexpand
 	    continue
 	  fi
 	  mkdir keywordexpand; cd keywordexpand
 	  dotest keywordexpand-1 "${testcvs} -q co CVSROOT" \
-'U CVSROOT/checkoutlist
+'U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -12334,53 +12349,55 @@ $SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/
 	  # -s: modules.
 	  # -d: modules, modules3, cvsadm
 	  # -i, -o, -u, -e, -t: modules5
 	  # slashes in module names: modules3
 	  # invalid module definitions: modules6
 	  ############################################################
 	  # These tests are to make sure that administrative files get
 	  # rebuilt, regardless of how and where files are checked
 	  # out.
 	  ############################################################
 	  # Check out the whole repository
 	  mkdir 1; cd 1
-	  dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/checkoutlist
+	  dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 U CVSROOT/verifymsg'
 	  echo "# made a change" >>CVSROOT/modules
 	  dotest modules-1d "${testcvs} -q ci -m add-modules" \
 "$CVSROOT_DIRNAME/CVSROOT/modules,v  <--  CVSROOT/modules
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
 	  cd ..
 	  rm -rf 1
 	  ############################################################
 	  # Check out CVSROOT
 	  mkdir 1; cd 1
-	  dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
+	  dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -12389,27 +12406,28 @@ U CVSROOT/verifymsg'
 	  dotest modules-2d "${testcvs} -q ci -m add-modules" \
 "$CVSROOT_DIRNAME/CVSROOT/modules,v  <--  CVSROOT/modules
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
 	  cd ..
 	  rm -rf 1
 	  ############################################################
 	  # Check out CVSROOT in some other directory
 	  modify_repo mkdir $CVSROOT_DIRNAME/somedir
 	  mkdir 1; cd 1
 	  dotest modules-3 "${testcvs} -q co somedir" ''
 	  cd somedir
-	  dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
+	  dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -12451,27 +12469,28 @@ $SPROG commit: Rebuilding administrative
 ${SPROG} add: scheduling file .b. for addition
 ${SPROG} add: use .${SPROG} commit. to add these files permanently"
 	  dotest modules-145 "$testcvs ci -m added" \
 "$CPROG commit: Examining .
 $CPROG commit: Examining ssdir
 $CVSROOT_DIRNAME/first-dir/subdir/a,v  <--  a
 initial revision: 1\.1
 $CVSROOT_DIRNAME/first-dir/subdir/b,v  <--  b
 initial revision: 1\.1"
 	  cd ..
 	  dotest modules-146 "$testcvs -q co CVSROOT" \
-"U CVSROOT/checkoutlist
+"U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -13259,27 +13278,28 @@ add-it
 ${SPROG} add: scheduling file .b. for addition
 ${SPROG} add: use .${SPROG} commit. to add these files permanently"
 	  dotest modules5-5 "${testcvs} ci -m added" \
 "${CPROG} commit: Examining .
 ${CPROG} commit: Examining ssdir
 ${CVSROOT_DIRNAME}/first-dir/subdir/a,v  <--  a
 initial revision: 1\.1
 ${CVSROOT_DIRNAME}/first-dir/subdir/b,v  <--  b
 initial revision: 1\.1"
 	  cd ..
 	  dotest modules5-6 "${testcvs} -q co CVSROOT" \
-"U CVSROOT/checkoutlist
+"U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -15563,26 +15583,28 @@ RCS file: $CVSROOT_DIRNAME/CVSROOT$DOTST
 "${testcvs} co -d ${CVSROOT_DIRNAME} CVSROOT" \
 "${CPROG} \[checkout aborted\]: Cannot check out files into the repository itself" \
 "${SPROG} \[checkout aborted\]: absolute pathnames invalid for server (specified \`${CVSROOT_DIRNAME}')"
 	  # The behavior of the client/server test below should be correct.
 	  # The CVS client currently has no way of knowing that the client and
 	  # server are the same machine and thus skips the $CVSROOT checks.
 	  # I think checking for this case in CVS would be bloat since this
 	  # should be a fairly rare occurance.
 	  cd ${CVSROOT_DIRNAME}
           dotest_fail checkout_repository-2 "${testcvs} co CVSROOT" \
 "${CPROG} \[checkout aborted\]: Cannot check out files into the repository itself" \
 "${SPROG} checkout: Updating CVSROOT
 ${CPROG} checkout: move away \`CVSROOT/aclconfig'; it is in the way
 C CVSROOT/aclconfig
 ${CPROG} checkout: move away \`CVSROOT/checkoutlist'; it is in the way
 C CVSROOT/checkoutlist
 ${CPROG} checkout: move away \`CVSROOT/commitinfo'; it is in the way
 C CVSROOT/commitinfo
 ${CPROG} checkout: move away \`CVSROOT/config'; it is in the way
 C CVSROOT/config
 ${CPROG} checkout: move away \`CVSROOT/cvswrappers'; it is in the way
 C CVSROOT/cvswrappers
 ${CPROG} checkout: move away \`CVSROOT/loginfo'; it is in the way
 C CVSROOT/loginfo
 ${CPROG} checkout: move away \`CVSROOT/modules'; it is in the way
 C CVSROOT/modules
 ${CPROG} checkout: move away \`CVSROOT/notify'; it is in the way
 @@ -15731,37 +15753,39 @@ new revision: 1\.1\.2\.1; previous revis
 RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
 Working file: file1
 head: 1\.1
 branch:
 locks: strict
 access list:
 keyword substitution: kv
 total revisions: 2;	selected revisions: 2
 description:
 ----------------------------
 revision 1\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid};
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Committing in .
 xCVS:
 xCVS: Added Files:
 xCVS: 	file1 file2
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  commitid: ${commitid};
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Committing in .
 xCVS:
 xCVS: Modified Files:
 xCVS:  Tag: br
 xCVS: 	file1
 xCVS: ----------------------------------------------------------------------
 ============================================================================="
 	  # The only difference between the two expect strings is the
 	  # presence or absence of "Committing in ." for 1.1.2.1.
 @@ -15769,69 +15793,73 @@ xCVS: ----------------------------------
 RCS file: ${CVSROOT_DIRNAME}/first-dir/file2,v
 Working file: file2
 head: 1\.1
 branch:
 locks: strict
 access list:
 keyword substitution: kv
 total revisions: 2;	selected revisions: 2
 description:
 ----------------------------
 revision 1\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid};
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Committing in .
 xCVS:
 xCVS: Added Files:
 xCVS: 	file1 file2
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  commitid: ${commitid};
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Modified Files:
 xCVS:  Tag: br
 xCVS: 	file2
 xCVS: ----------------------------------------------------------------------
 =============================================================================" "
 RCS file: ${CVSROOT_DIRNAME}/first-dir/file2,v
 Working file: file2
 head: 1\.1
 branch:
 locks: strict
 access list:
 keyword substitution: kv
 total revisions: 2;	selected revisions: 2
 description:
 ----------------------------
 revision 1\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid};
 branches:  1\.1\.2;
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Committing in .
 xCVS:
 xCVS: Added Files:
 xCVS: 	file1 file2
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
 date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  commitid: ${commitid};
+x
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
 xCVS: Committing in .
 xCVS:
 xCVS: Modified Files:
 xCVS:  Tag: br
 xCVS: 	file2
 xCVS: ----------------------------------------------------------------------
 ============================================================================="
 	  # Test CVS's response to an unchanged log message
 	  cat >${TESTDIR}/editme <<EOF
 @@ -31449,27 +31477,27 @@ EOF
 	  sleep 1
 	  dotest_fail client-18 "$testcvs update" \
 "$CPROG \[update aborted\]: protocol error: Copy-file tried to specify directory"
 	  # And verify that none of the exploits was successful.
 	  dotest client-19 "cat $HOME/.bashrc" \
 "#!$TESTSHELL
 # This is where login scripts would usually be
 # stored\."
 	  # Check that the client detects redirect loops.
 	  cat >$TESTDIR/serveme <<EOF
 #!$TESTSHELL
-echo "Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set Gssapi-authenticate expand-modules ci co update diff log rlog list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version"
+echo "Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set Gssapi-authenticate expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version"
 echo "ok"
 echo "Redirect $CVSROOT"
 # Eat up data from the client to avoid broken pipe errors.
 cat >/dev/null
 EOF
 	  echo newstuff >file1
 	  sleep 1
 	  dotest_fail client-20 "$testcvs ci" \
 "$CPROG commit: Examining \.
 $CPROG \[commit aborted\]: \`Redirect' loop detected\.  Server misconfiguration$QUESTION"
 	  dokeep
 @@ -31858,27 +31886,27 @@ ALL $RSYNC -gopr --delete $PRIMARY_CVSRO
 EOF
 	  cat >>config <<EOF
 PrimaryServer=$PRIMARY_CVSROOT
 EOF
 	  dotest writeproxy-init-3 \
 "$testcvs -Q ci -mconfigure-writeproxy"
 	  # Quickly verify that the server can resolve symlinks when
 	  # determining whether it is the primary.
 	  # This shouldn't actually change the repository.
 	  save_CVS_SERVER=$CVS_SERVER
 	  ln -s $PRIMARY_CVSROOT_DIRNAME $TESTDIR/primary_link
 	  dotest writeproxy-0 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
 ok
 ok
 ok" \
 << EOF
 Root $TESTDIR/primary_link
 Valid-responses ok error Valid-requests Redirect Checked-in New-entry Checksum Copy-file Updated Created Update-existing Merged Patched Rcs-diff Mode Mod-time Removed Remove-entry Set-static-directory Clear-static-directory Set-sticky Clear-sticky Edit-file Template Clear-template Notified Module-expansion Wrapper-rcsOption M Mbinary E F MT
 valid-requests
 UseUnchanged
 Command-prep commit
 Global_option -q
 Global_option -Q
 Argument -m
 Argument configure-writeproxy
 @@ -31907,27 +31935,28 @@ EOF
 	  rm $TESTDIR/primary_link
 	  # And now the secondary.
 	  $RSYNC -gopr $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
 	  # Checkout from secondary
+	  #
 	  # For now, move the primary root out of the way to satisfy
 	  # ourselves that the data is coming from the secondary.
 	  mv $PRIMARY_CVSROOT_DIRNAME $TESTDIR/save-root
 	  cd ../..
 	  mkdir secondary; cd secondary
 	  dotest writeproxy-1 "$testcvs -qd$SECONDARY_CVSROOT co CVSROOT" \
-"U CVSROOT/checkoutlist
+"U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -32106,27 +32135,28 @@ EOF
 	  # in fork mode, the deciding factor is the PrimaryServer translation
 	  # above.
+	  #
 	  # When the primary and secondary hostname were different, the server
 	  # the client is talking directly to is more obvious.
+	  #
 	  # For now, move the primary root out of the way to satisfy
 	  # ourselves that the data is coming from the secondary.
 	  mv $PRIMARY_CVSROOT_DIRNAME $TESTDIR/save-root
 	  cd ../..
 	  mkdir secondary; cd secondary
 	  dotest writeproxy-noredirect-1 \
 "$testcvs -qd'$PRIMARY_CVSROOT' co CVSROOT" \
-"U CVSROOT/checkoutlist
+"U CVSROOT/aclconfig
 U CVSROOT/checkoutlist
 U CVSROOT/commitinfo
 U CVSROOT/config
 U CVSROOT/cvswrappers
 U CVSROOT/loginfo
 U CVSROOT/modules
 U CVSROOT/notify
 U CVSROOT/postadmin
 U CVSROOT/postproxy
 U CVSROOT/posttag
 U CVSROOT/postwatch
 U CVSROOT/preproxy
 U CVSROOT/rcsinfo
 U CVSROOT/taginfo
 @@ -32142,27 +32172,27 @@ PrimaryServer=$PRIMARY_CVSROOT"
 	  # Checkin to secondary
 	  cd ..
 	  dotest writeproxy-noredirect-4 \
 "$testcvs -Qd'$PRIMARY_CVSROOT' co -ldtop ."
 	  cd top
 	  mkdir firstdir
 	  # Have to move the primary root back before we can perform write
 	  # operations.
 	  mv $TESTDIR/save-root $PRIMARY_CVSROOT_DIRNAME
 	  dotest writeproxy-noredirect-5 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
 ok
 ok
 ok
 Clear-template firstdir/
 firstdir/
 ok" \
 << EOF
 Root $PRIMARY_CVSROOT_DIRNAME
 Valid-responses ok error Valid-requests Checked-in New-entry Checksum Copy-file Updated Created Update-existing Merged Patched Rcs-diff Mode Mod-time Removed Remove-entry Set-static-directory Clear-static-directory Set-sticky Clear-sticky Template Clear-template Notified Module-expansion Wrapper-rcsOption M Mbinary E F MT
 valid-requests
 UseUnchanged
 Command-prep add
 Global_option -q
 @@ -32174,27 +32204,27 @@ firstdir
 Directory .
 Argument firstdir
 add
 EOF
 	  # Gotta update the workspace ourselves since we bypassed the client.
 	  cp -R CVS firstdir/CVS
 	  echo "firstdir" >firstdir/CVS/Repository
 	  cd firstdir
 	  echo now you see me >file1
 	  dotest writeproxy-noredirect-6 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
 ok
 ok
 ok
 Checked-in \./
 firstdir/file1
 /file1/0///
 ok" \
 << EOF
 Root $PRIMARY_CVSROOT_DIRNAME
 Valid-responses ok error Valid-requests Checked-in New-entry Checksum Copy-file Updated Created Update-existing Merged Patched Rcs-diff Mode Mod-time Removed Remove-entry Set-static-directory Clear-static-directory Set-sticky Clear-sticky Template Clear-template Notified Module-expansion Wrapper-rcsOption M Mbinary E F MT
 valid-requests
 UseUnchanged
 Command-prep add
 @@ -32204,27 +32234,27 @@ wrapper-sendme-rcsOptions
 Argument --
 Directory .
 firstdir
 Is-modified file1
 Argument file1
 add
 EOF
 	  # Have to add it to the workspace ourselves again since we are
 	  # bypassing the client.
 	  echo /file1/0/dummy+timestamp// >>CVS/Entries
 	  dotest writeproxy-noredirect-7 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
 ok
 ok
 Mode u=rw,g=rw,o=r
 Checked-in \./
 firstdir/file1
 /file1/1\.1///
 ok" \
 << EOF
 Root $PRIMARY_CVSROOT_DIRNAME
 Valid-responses ok error Valid-requests Checked-in New-entry Checksum Copy-file Updated Created Update-existing Merged Patched Rcs-diff Mode Mod-time Removed Remove-entry Set-static-directory Clear-static-directory Set-sticky Clear-sticky Template Clear-template Notified Module-expansion Wrapper-rcsOption M Mbinary E F MT
 valid-requests
 UseUnchanged
 Command-prep commit
 @@ -32531,26 +32561,27 @@ EOF
 	  # Perform some cleanup for normalized testing...
 	  rm ${CVSROOT_DIRNAME}/CVSROOT/history
 	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/cvsignore
 	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/cvsignore,v
 	  # checkout the trace option
 	  mkdir trace && cd trace
 	  mkdir imp && cd imp
 	  touch file1
 	  dotest_sort trace-1 "${testcvs} -t -t -t init" \
 "  *-> Lock_Cleanup()
   *-> RCS_checkout (aclconfig,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (checkoutlist,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (commitinfo,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (config,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (cvswrappers,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (loginfo,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (modules,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (notify,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (postadmin,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (postproxy,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (posttag,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (postwatch,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (preproxy,v, , , , \.#[0-9][0-9]*)
   *-> RCS_checkout (rcsinfo,v, , , , \.#[0-9][0-9]*)
 @@ -32563,26 +32594,27 @@ EOF
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#[0-9][0-9]*)
   *-> unlink_file(\.#aclconfig)
   *-> unlink_file(\.#checkoutlist)
   *-> unlink_file(\.#commitinfo)
   *-> unlink_file(\.#config)
   *-> unlink_file(\.#cvswrappers)
   *-> unlink_file(\.#loginfo)
   *-> unlink_file(\.#modules)
   *-> unlink_file(\.#notify)
   *-> unlink_file(\.#postadmin)
   *-> unlink_file(\.#postproxy)
   *-> unlink_file(\.#posttag)
   *-> unlink_file(\.#postwatch)
   *-> unlink_file(\.#preproxy)
   *-> unlink_file(\.#rcsinfo)
 @@ -32590,26 +32622,27 @@ EOF
   *-> unlink_file(\.#verifymsg)
   *-> walklist ( list=${PFMT}, proc=${PFMT}, closure=${PFMT} )
   *-> walklist ( list=${PFMT}, proc=${PFMT}, closure=${PFMT} )" \
+"
   *-> Forking server: ${CVS_SERVER} server
   *-> main loop with CVSROOT=${CVSROOT}
   *-> parse_cvsroot ( ${CVSROOT} )
   *-> walklist ( list=${PFMT}, proc=${PFMT}, closure=${PFMT} )
   *-> walklist ( list=${PFMT}, proc=${PFMT}, closure=${PFMT} )
   *-> walklist ( list=${PFMT}, proc=${PFMT}, closure=${PFMT} )
 S -> CVS_SERVER_SLEEP not set\.
 S -> Lock_Cleanup()
 S -> Lock_Cleanup()
 S -> RCS_checkout (aclconfig,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (checkoutlist,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (commitinfo,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (config,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (cvswrappers,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (loginfo,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (modules,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (notify,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (postadmin,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (postproxy,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (posttag,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (postwatch,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (preproxy,v, , , , \.#[0-9][0-9]*)
 S -> RCS_checkout (rcsinfo,v, , , , \.#[0-9][0-9]*)
 @@ -32626,26 +32659,27 @@ S -> server_notify()
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#[0-9][0-9]*)
 S -> unlink_file(\.#aclconfig)
 S -> unlink_file(\.#checkoutlist)
 S -> unlink_file(\.#commitinfo)
 S -> unlink_file(\.#config)
 S -> unlink_file(\.#cvswrappers)
 S -> unlink_file(\.#loginfo)
 S -> unlink_file(\.#modules)
 S -> unlink_file(\.#notify)
 S -> unlink_file(\.#postadmin)
 S -> unlink_file(\.#postproxy)
 S -> unlink_file(\.#posttag)
 S -> unlink_file(\.#postwatch)
 S -> unlink_file(\.#preproxy)
 S -> unlink_file(\.#rcsinfo)