Latest version from Cyclic

18 files changed, 1501 insertions, 340 deletions

diff --git a/gnu/usr.bin/cvs/src/ChangeLog b/gnu/usr.bin/cvs/src/ChangeLog
index 96e17012329..4f13ee6143b 100644
--- a/gnu/usr.bin/cvs/src/ChangeLog
+++ b/gnu/usr.bin/cvs/src/ChangeLog
@@ -1,5 +1,355 @@
+1998-05-23  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* Version 1.9.28.
+
+1998-05-22  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* rcs.c (RCS_cmp_file): Check for errors from CVS_FOPEN.  This
+	restores the CVS 1.9 behavior (fatal error if we can't open the
+	file), and corrects an apparent oversight in Ian's 13 Apr 1997
+	change.
+	* sanity.sh (modes2): New test, tests for this.
+
+1998-05-22  Ian Lance Taylor  <ian@cygnus.com>
+
+        * server.c (server_updated): Correct test for whether to unlink
+        the file.
+
+1998-05-20  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* wrapper.c (wrap_add): Disable -t/-f wrappers at least until the
+	serious bug can be fixed.
+
+1998-05-15  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* checkout.c (checkout): Call server_pathname_check on the
+	argument to "cvs co -d".
+	* server.c (server_pathname_check): Add comment about how we could
+	be handling absolute pathnames.
+	* sanity.sh (abspath): Rewrite the tests which run "cvs co -d /foo"
+	for remote, to reflect this.
+
+	* sanity.sh (abspath): Also do the "cannot rename" work-around for
+	abspath-7d.
+
+1998-05-13  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* commit.c (commit_filesdoneproc): Free admin_dir when done with it.
+
+1998-05-13  Jim Meyering  <meyering@ascend.com>
+
+	* sanity.sh (editor): Change bogus sed command, `s/^/x&/g', to `s/^/x/'.
+	The former exercised a bug in GNU sed-3.01-beta3.
+	(emptydir-8): Add `Rebuilding administrative file database' message,
+	since now it does that.
+	* commit.c (commit_filesdoneproc): Pass only the admin directory
+	pathname to mkmodules.
+	Remove #if 0, now that it's fixed.
+
+	* status.c (cvsstatus): Rename from `status' to avoid shadowing
+	lots of locals and parameters by the same name.
+	* server.c (serve_status): Update caller.
+	* main.c (cmds[]): Update table entry.
+	* cvs.h: Update prototype.
+
+	* commit.c (commit_filesdoneproc): Remove trailing blanks.
+	(commit) [CLIENT_SUPPORT]: Remove unnecessary (and local-shadowing)
+	declaration of `err'.
+	Rename global `tag' to `saved_tag' to avoid overshadowing `tag'
+	parameters of three functions.
+	Rename global `message' to `saved_message' to avoid overshadowing
+	`message' parameter of a function.
+	Rename global `ulist' to `saved_ulist' and move dcl up with others.
+
+1998-05-12  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* commit.c (commit_filesdoneproc): #if 0 the new code until it can
+	be fixed.
+
+	* commit.c (commit_filesdoneproc): Add comment explaining last
+	change.
+
+1998-05-12  Jim Meyering  <meyering@ascend.com>
+
+	* commit.c (commit_filesdoneproc): Call mkmodules not just when
+	committing a file directly under CVSROOT, but also when committing
+	files in subdirectories of CVSROOT.
+
+1998-05-08  Jim Meyering  <meyering@ascend.com>
+
+	* filesubr.c (xreadlink):  NUL-terminate the symbolic link name.
+	Use a much smaller initial buffer length.
+	Test errno only if readlink fails.
+	Use xstrdup then free the original link name so we don't waste space.
+
+1998-05-02  Jim Meyering  <meyering@ascend.com>
+
+	* rcs.c (rcsbuf_getword): Fix off-by-one error that would result in
+	an abort (the first one in rcsbuf_getkey) when operating on on some
+	,v files with over 8192 bytes of tag and branch info.
+
+1998-05-04  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh (ann): New tests ann-12 and ann-13 test for specifying
+	a numeric branch.
+
+1998-05-02  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* rcs.c: Add comments about getting rid of rcsbuf_getid,
+	rcsbuf_getword, and rcsbuf_getstring.
+
+	* sanity.sh (abspath): Revise the workarounds to deal with exit
+	status.
+
+1998-04-30  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh (abspath): Work around the "cannot rename" bug.
+
+1998-04-27  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* classify.c (Classify_File): Add comments about checking whether
+	command name is "update".
+
+1998-04-22  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* version.c: Change version number to 1.9.27.1.
+
+	* Version 1.9.27.
+
+1998-04-20  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	(This diff was run by devel-cvs and everyone seemed to like it).
+	* diff.c (diff_file_nodiff): Make HEAD mean the head of the branch
+	which contains the sticky tag, not the sticky tag itself.
+	* rcs.c, rcs.h (RCS_branch_head): New function.
+	* sanity.sh (head): Update for this changed behavior.
+
+1998-04-19  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh: Move emptydir tests from basicb to new test emptydir.
+	This is because we now need a module definition to create Emptydir;
+	"co -d" doesn't cut it anymore.
+
+1998-04-17  Petri Virkkula
+
+	* server.c (mkdir_p): Ignore EROFS error (like for EACCES).
+
+1998-04-16  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* checkout.c (checkout_proc): Don't create directories above the
+	last one specified in "co -d".
+	(build_dirs_and_chdir): Revert Noel's change of 17 Feb 1998.
+	(struct dir_to_build): New field just_chdir.
+	(build_dirs_and_chdir): Test it.
+	* sanity.sh (abspath): New tests abspath-7* test for a bug which
+	we fix, in which CVS would create bogus "D/////" entries in
+	CVS/Entries.
+	(abspath): Revise abspath-3* tests to test for the fact that we no
+	longer create directories above the last one specified in "co -d".
+	I checked that CVS 1.9 gives an error on this, so changing this
+	behavior back should be OK.
+	(cvsadm-2d3): Likewise (also checked CVS 1.9 for this case).
+	(cvsadm-2d3d): Likewise (also checked CVS 1.9 for this case).
+	(cvsadm-2d{4,5,6,7,8}, cvsadm-N2d{3,4,5,6,7,8}): Adjust for new
+	behavior (same case as cvsadm-2d3).
+	(cvsadm-2d{4,5,6,7,8}d, cvsadm-N2d{3,4,5,6,7,8}d): Remove test
+	(same case as cvsadm-2d3d).
+	(cvsadm): For remote, skip most these tests.
+	(abspath): When cleaning up, delete mod1 and mod2 rather than mod1
+	twice (longstanding bug, apparently only becomes visible if you
+	run the tests in a certain order).
+
+1998-04-14  Wilfredo Sanchez  <wsanchez@apple.com>
+
+	* rcs.c: variable "lockfile" was being referenced after being
+	free'd.  Bad.  Moved the free() call down.
+
+1998-04-12  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh (rcs): Add test for annotate and the year 2000.
+
+	* server.c (do_cvs_command): If there are partial lines left when
+	the child process is done, send them along.
+	* sanity.sh (rcs, rcs2): Enable all tests for remote; tests for
+	this fix.
+
+1998-04-11  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* client.c (client_senddate): Pass SDATEFORM not DATEFORM to
+	sscanf.  This fixes a Y2K bug.
+
+	* history.c (history, select_hrec): Change since_date from time_t
+	to RCS format.  Use the usual machinery (in particular, Make_Date
+	and client_senddate) so that it will work on VMS too.
+	* main.c, cvs.h (date_from_time_t): New function.
+	* sanity.sh (history): New test, to test that this didn't break
+	anything (also tests client_senddate fix).
+
+1998-04-11  Norbert Kiesel  <nk@iname.com>
+
+	* server.c (cvs_output_binary): Shut up "gcc -Wall" by removing
+	unnecessary else if test.
+	* server.c (check_password): Fix uninitialized memory read if
+ 	shadow passwords are used.  Also added some comments.
+	* rcs.c (RCS_checkout): Make sure to call chown with -1 for uid or
+	gid if they should not be changed
+
+1998-04-10  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh (rcs2): New test, tests for various Y2K cases.
+	* rcs.c (getdelta): Value for "state" keyword is optional (bug
+	discovered incidentally in writing rcs2 test).
+
+1998-04-09  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* filesubr.c, cvs.h (link_file): Remove; no longer used.
+
+1998-04-08  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* recurse.c (do_dir_proc): Restore update_dir rather than a
+	computation which appears to, but does not necessarily, restore it
+	(reported by various people; this fix is from Greg Hudson).
+	* sanity.sh (importc): New test, tests for this fix.
+
+1998-03-27  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* rcs.c (RCS_lock): If the revision is already locked, give an
+	error rather than dumping core.
+	* sanity.sh (reserved): New test reserved-13c tests for this.
+
+1998-03-25  Loren J. Rittle
+
+	* import.c (add_rev): Rewrite to use RCS_FLAGS_KEEPFILE option
+	of RCS_checkin() to avoid damage to imported files instead of
+	externally undoing damage after the fact.  The side effect is
+	that callers of add_rev() may now incrementally walk the
+	entries of the current directory without seeing gratuitous
+	changes to the directory structure (under at least one file
+	system under at least one OS).
+
+1998-03-18  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* error.c (error): Save and restore errno.  Should fix test case
+	conflicts3-23 on SCO 5.0.2.  Reported by Steve Cameron.
+
+	* sanity.sh (admin): Rename admin-26-o* to admin-26-*; the "o"
+	stands for "cvs admin -o".  Add comment about length of tests.
+	Use ${PLUS}.
+
+1998-03-05  Dan Wilder <dan@gasboy.com>
+
+ 	* Fix problem with cvs admin in which -ntag:branch
+ 	option associated tag with the branch's head revision.
+ 	Should have used branch number.  Entailed in this fix,
+ 	the following.
+
+ 	* Add new functions "RCS_exist_rev", "RCS_exist_tag",
+ 	"RCS_tag2rev", and "RCS_valid_rev" to rcs.c.  RCS_tag2rev
+ 	is similar to RCS_gettag, but does less interpretation.
+
+ 	* Plug a small memory leak.
+
+ 	* Add tests admin-26 through admin-29 to sanity.sh,
+ 	to test "cvs admin -n".
+
+1998-03-17  Samuel Tardieu  <sam@inf.enst.fr>
+
+	* server.c (server_register): protect dereferencing timestamp in
+	the trace message when it is null, to avoid a segmentation fault.
+
+1998-03-16  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* options.h.in (MY_NDBM): Rewrite the comment explaining this
+	option.  It was not clear to everyone who "my" referred to, for
+	example.
+
+	* hardlink.c (list_linked_files_on_disk): Remove unused variables
+	err and p.
+	(list_linked_files_on_disk): Add comment about memory allocation
+	of return value.
+	* rcs.c (rcsbuf_getword): Shut up gcc -Wall with a "return 0".
+	(RCS_checkin): Remove unused variable fullpath.
+	* sanity.sh (hardlinks): Remove comment about spurious warnings;
+	the warnings are gone.
+
+1998-03-12  Tim Pierce  <twp@skepsis.com>
+
+	New functions for parsing and writing hardlink fields.
+	* rcs.c [PRESERVE_PERMISSIONS_SUPPORT] (puthardlink_proc): New
+	function.
+	(putdelta) [PRESERVE_PERMISSIONS_SUPPORT]: Use it.
+	(rcsbuf_getid, rcsbuf_getstring, rcsbuf_getword): New functions.
+	(getdelta): Call them, storing `hardlinks' field in vnode->hardlinks.
+	(RCS_reparsercsfile): When setting rdata->desc, xstrdup value
+	rather than rcsbuf_valcopying it (due to changes in how getdelta
+	handles keys and values in newphrases).
+
+	* sanity.sh (hardlinks): Use uglier filenames.  Checking out
+	hardlinked files no longer produces the same spurious diagnostics,
+	so fix that test.
+	(hardlinks-2.3): Renamed from hardlinks-2.2 (duplicate test name).
+
+	New infrastructure for managing hardlink lists internally...
+	* hardlink.c, hardlink.h (list_linked_files_on_disk,
+	compare_linkage_lists, find_checkedout_proc): New functions.
+	* rcs.h (struct rcsversnode) [PRESERVE_PERMISSIONS_SUPPORT]: New
+	member `hardlinks'.
+	* update.c (special_file_mismatch): Get hardlinks from
+	vp->hardlinks instead of from vp->other_delta.
+	* rcs.c (free_rcsvers_contents): Comment about freeing hardlinks
+	member.
+	(RCS_checkout) [PRESERVE_PERMISSIONS_SUPPORT]: Get hardlinks from
+	vers->hardlinks list instead of vers->other_delta.
+
+	... and removed obsolete code from earlier revs.
+	* hardlink.c, hardlink.h (list_files_linked_to,
+	cache_hardlinks_proc, list_files_proc, set_hardlink_field_proc):
+	Removed.
+	* hardlink.h: Removed `links' member from hardlink_info struct.
+	* commit.c (commit): Remove the call to cache_hardlinks_proc.
+	(check_fileproc) [PRESERVE_PERMISSIONS_SUPPORT]: Removed reference
+	to hlinfo->links.
+	* hardlink.c (update_hardlink_info): Same.
+	* update.c (get_linkinfo_proc): Same.
+
+	* rcs.c (RCS_checkout) [PRESERVE_PERMISSIONS_SUPPORT]: Use
+	vp->hardlinks and find_checkedout_proc to find recently-updated
+	files that may be hardlinked.
+	* update.c (special_file_mismatch): Use List * structures and
+	compare_linkage_lists for rev1_hardlinks and rev2_hardlinks.
+
+1998-03-16  Larry Jones  <larry.jones@sdrc.com>
+
+	* server.c (check_password): If shadow passwords are supported but no
+	entry is found in the shadow file, check the regular password file.
+
+1998-03-07  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* sanity.sh: Rename permissions test to perms since that is what
+	each of its individual tests are named.
+	* sanity.sh (perms symlinks hardlinks): Change CVSROOT to
+	CVSROOT_DIRNAME where appropriate.
+	(perms symlinks hardlinks): Disable/adjust the meat of the tests for
+	remote.
+	(symlinks): Link to ${TESTDIR}/fumble rather than
+	/fumble/mumble/grumble.  We shouldn't be making assumptions about
+	what might exist in random directories outside ${TESTDIR}.
+	* hardlink.c (cache_hardlinks_proc): Add comment about trimming
+	whitespace.
+
+1998-03-07  Tim Pierce  <twp@skepsis.com>
+
+	* rcs.c (RCS_checkout): Negation bug when checking out symlinks:
+	existence_error should be !existence_error.
+	* sanity.sh (permissions symlinks hardlinks): New tests, for
+	PreservePermissions.
+
 1998-03-04  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
+	* version.c: Change version number to 1.9.26.1.
+
+	* Version 1.9.26.
+
 	* entries.c, cvs.h (Entries_Open): New argument update_dir; use it
 	in error message.
 	* add.c, checkout.c, client.c, find_names.c, import.c, recurse.c,
@@ -30,7 +380,7 @@
 	* update.c (special_file_mismatch): Compare the hard links of the
 	two revisions.
 
-	* rcs.c (RCS_checkout): 
+	* rcs.c (RCS_checkout):
 
 	* hardlink.c, hardlink.h: New files.
 	(hardlink_info): New struct.
@@ -235,7 +585,7 @@ Tue Feb 17 02:32:21 1998  Noel Cragg  <noel@swish.red-bean.com>
 
 	[These mods make "checkout" work with "-d /absolute/pathname"
 	once again.]
-	
+
 	* checkout.c (checkout_proc): the -d flag on the command line
  	should override the -d flag in the modules file if the latter is
  	an absolute path.  The loop that assembles the list of directories
@@ -255,7 +605,7 @@ Tue Feb 17 02:32:21 1998  Noel Cragg  <noel@swish.red-bean.com>
 
 	* create_adm.c (Create_Admin): include the directory in the error
  	message.
-	
+
 1998-02-16  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* diff.c (diff_fileproc), import.c (import, add_rcs_file), rcs.c
@@ -294,7 +644,7 @@ Tue Feb 17 02:32:21 1998  Noel Cragg  <noel@swish.red-bean.com>
 
 	Support for device special files, symbolic links, user and group
 	ownerships, and file permissions.
-	
+
 	* parseinfo.c: (parse_config): Handle new config variable
 	`PreservePermissions'.
 	* mkmodules.c (config_contents): Add new PreservePermissions var.
diff --git a/gnu/usr.bin/cvs/src/admin.c b/gnu/usr.bin/cvs/src/admin.c
index 3c50f4a57ac..72cddac616f 100644
--- a/gnu/usr.bin/cvs/src/admin.c
+++ b/gnu/usr.bin/cvs/src/admin.c
@@ -701,15 +701,27 @@ admin_fileproc (callerdat, finfo)
 			       rcs->path,
 			       tag, n->data);
 			status = 1;
+			free (tag);
 			continue;
 		    }
 		}
 
-		/* Expand rev if necessary. */
-		rev = RCS_gettag (rcs, p, 0, NULL);
-		RCS_settag (rcs, tag, rev);
-		if (rev != NULL)
+                /* Attempt to perform the requested tagging.  */
+
+		if ((*p == 0 && (rev = RCS_head (rcs)))
+                    || (rev = RCS_tag2rev (rcs, p))) /* tag2rev may exit */
+		{
+		    RCS_check_tag (tag); /* exit if not a valid tag */
+		    RCS_settag (rcs, tag, rev);
 		    free (rev);
+		}
+                else
+		{
+		    error (0, 0,
+			  "%s: Symbolic name or revision %s is undefined",
+			   rcs->path, p);
+		    status = 1;
+		}
 		free (tag);
 		break;
 	    case 's':
diff --git a/gnu/usr.bin/cvs/src/classify.c b/gnu/usr.bin/cvs/src/classify.c
index b33c9453778..b0084a3d0fa 100644
--- a/gnu/usr.bin/cvs/src/classify.c
+++ b/gnu/usr.bin/cvs/src/classify.c
@@ -288,6 +288,14 @@ conflict: %s created independently by second party",
 		 * There is no user file, so note that it was lost and
 		 * extract a new version
 		 */
+		/* Comparing the command_name against "update", in
+		   addition to being an ugly way to operate, means
+		   that this message does not get printed by the
+		   server.  That might be considered just a straight
+		   bug, although there is one subtlety: that case also
+		   gets hit when a patch fails and the client fetches
+		   a file.  I'm not sure there is currently any way
+		   for the server to distinguish those two cases.  */
 		if (strcmp (command_name, "update") == 0)
 		    if (!really_quiet)
 			error (0, 0, "warning: %s was lost", finfo->fullname);
@@ -367,6 +375,8 @@ conflict: %s created independently by second party",
 	    {
 		/* There is no user file, so just get it */
 
+		/* See comment at other "update" compare, for more
+		   thoughts on this comparison.  */
 		if (strcmp (command_name, "update") == 0)
 		    if (!really_quiet)
 			error (0, 0, "warning: %s was lost", finfo->fullname);
diff --git a/gnu/usr.bin/cvs/src/client.c b/gnu/usr.bin/cvs/src/client.c
index aa897d5c719..50c923e832b 100644
--- a/gnu/usr.bin/cvs/src/client.c
+++ b/gnu/usr.bin/cvs/src/client.c
@@ -5442,13 +5442,16 @@ option_with_arg (option, arg)
     send_arg (arg);
 }
 
-/*
- * Send a date to the server.  This will passed a string which is the
- * result of Make_Date, and looks like YY.MM.DD.HH.MM.SS, where all
- * the letters are single digits.  The time will be GMT.  getdate on
- * the server can't parse that, so we turn it back into something
- * which it can parse.
- */
+/* Send a date to the server.  The input DATE is in RCS format.
+   The time will be GMT.
+
+   We then convert that to the format required in the protocol
+   (including the "-D" option) and send it.  According to
+   cvsclient.texi, RFC 822/1123 format is preferred, but for now we
+   use the format that we always have, for
+   conservatism/laziness/paranoia.  As far as I know all servers
+   support the RFC 822/1123 format, so probably there would be no
+   particular danger in switching.  */
 
 void
 client_senddate (date)
@@ -5457,10 +5460,10 @@ client_senddate (date)
     int year, month, day, hour, minute, second;
     char buf[100];
 
-    if (sscanf (date, DATEFORM, &year, &month, &day, &hour, &minute, &second)
+    if (sscanf (date, SDATEFORM, &year, &month, &day, &hour, &minute, &second)
 	!= 6)
     {
-        error (1, 0, "diff_client_senddate: sscanf failed on date");
+        error (1, 0, "client_senddate: sscanf failed on date");
     }
 
     sprintf (buf, "%d/%d/%d %d:%d:%d GMT", month, day, year,
diff --git a/gnu/usr.bin/cvs/src/diff.c b/gnu/usr.bin/cvs/src/diff.c
index 7a4c105b9d3..341c04c248f 100644
--- a/gnu/usr.bin/cvs/src/diff.c
+++ b/gnu/usr.bin/cvs/src/diff.c
@@ -434,7 +434,15 @@ diff_fileproc (callerdat, finfo)
 		exists = 0;
 		/* special handling for TAG_HEAD */
 		if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
-		    exists = vers->vn_rcs != NULL;
+		{
+		    char *head =
+			(vers->vn_rcs == NULL
+			 ? NULL
+			 : RCS_branch_head (vers->srcfile, vers->vn_rcs));
+		    exists = head != NULL;
+		    if (head != NULL)
+			free (head);
+		}
 		else
 		{
 		    Vers_TS *xvers;
@@ -814,7 +822,9 @@ diff_file_nodiff (finfo, vers, empty_file)
     {
 	/* special handling for TAG_HEAD */
 	if (diff_rev1 && strcmp (diff_rev1, TAG_HEAD) == 0)
-	    use_rev1 = xstrdup (vers->vn_rcs);
+	    use_rev1 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
+			? NULL
+			: RCS_branch_head (vers->srcfile, vers->vn_rcs));
 	else
 	{
 	    xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0);
@@ -827,7 +837,9 @@ diff_file_nodiff (finfo, vers, empty_file)
     {
 	/* special handling for TAG_HEAD */
 	if (diff_rev2 && strcmp (diff_rev2, TAG_HEAD) == 0)
-	    use_rev2 = xstrdup (vers->vn_rcs);
+	    use_rev2 = ((vers->vn_rcs == NULL || vers->srcfile == NULL)
+			? NULL
+			: RCS_branch_head (vers->srcfile, vers->vn_rcs));
 	else
 	{
 	    xvers = Version_TS (finfo, NULL, diff_rev2, diff_date2, 1, 0);
diff --git a/gnu/usr.bin/cvs/src/error.c b/gnu/usr.bin/cvs/src/error.c
index cb69bdeff4f..9dcc162261e 100644
--- a/gnu/usr.bin/cvs/src/error.c
+++ b/gnu/usr.bin/cvs/src/error.c
@@ -89,7 +89,15 @@ error_exit PROTO ((void))
    thing for the server, whether the normal server_active (child process)
    case or the error_use_protocol (parent process) case.  The one exception
    is that STATUS nonzero for error_use_protocol probably doesn't work yet;
-   in that case still need to use the pending_error machinery in server.c.  */
+   in that case still need to use the pending_error machinery in server.c.
+
+   error() does not molest errno; some code (e.g. Entries_Open) depends
+   on being able to say something like:
+      error (0, 0, "foo");
+      error (0, errno, "bar");
+
+   */
+
 /* VARARGS */
 void
 #if defined (HAVE_VPRINTF) && defined (__STDC__)
@@ -102,6 +110,9 @@ error (status, errnum, message, va_alist)
     va_dcl
 #endif
 {
+    /* Prevent strtoul (via int_vasprintf) from clobbering it.  */
+    int save_errno = errno;
+
 #ifdef HAVE_VPRINTF
     if (message[0] != '\0')
     {
@@ -211,6 +222,7 @@ error (status, errnum, message, va_alist)
 
     if (status)
 	error_exit ();
+    errno = save_errno;
 }
 
 /* Print the program name and error message MESSAGE, which is a printf-style
diff --git a/gnu/usr.bin/cvs/src/filesubr.c b/gnu/usr.bin/cvs/src/filesubr.c
index 0ccc3df9180..1c24b2f64fa 100644
--- a/gnu/usr.bin/cvs/src/filesubr.c
+++ b/gnu/usr.bin/cvs/src/filesubr.c
@@ -415,29 +415,6 @@ rename_file (from, to)
 }
 
 /*
- * link a file, if possible.  Warning: the Windows NT version of this
- * function just copies the file, so only use this function in ways
- * that can deal with either a link or a copy.
- */
-int
-link_file (from, to)
-    const char *from;
-    const char *to;
-{
-    if (trace)
-#ifdef SERVER_SUPPORT
-	(void) fprintf (stderr, "%c-> link(%s,%s)\n",
-			(server_active) ? 'S' : ' ', from, to);
-#else
-	(void) fprintf (stderr, "-> link(%s,%s)\n", from, to);
-#endif
-    if (noexec)
-	return (0);
-
-    return (link (from, to));
-}
-
-/*
  * unlink a file, if possible.
  */
 int
@@ -770,7 +747,9 @@ xreadlink (link)
     const char *link;
 {
     char *file = NULL;
-    int buflen = BUFSIZ;
+    char *tfile;
+    int buflen = 128;
+    int link_name_len;
 
     if (!islink (link))
 	return NULL;
@@ -781,18 +760,21 @@ xreadlink (link)
     do
     {
 	file = xrealloc (file, buflen);
-	errno = 0;
-	readlink (link, file, buflen);
+	link_name_len = readlink (link, file, buflen - 1);
 	buflen *= 2;
     }
-    while (errno == ENAMETOOLONG);
+    while (link_name_len < 0 && errno == ENAMETOOLONG);
 
-    if (errno)
+    if (link_name_len < 0)
 	error (1, errno, "cannot readlink %s", link);
 
-    return file;
-}
+    file[link_name_len] = '\0';
 
+    tfile = xstrdup (file);
+    free (file);
+
+    return tfile;
+}
 
 
 /* Return a pointer into PATH's last component.  */
diff --git a/gnu/usr.bin/cvs/src/hardlink.c b/gnu/usr.bin/cvs/src/hardlink.c
index 51bd2a60567..b279aa9c3d0 100644
--- a/gnu/usr.bin/cvs/src/hardlink.c
+++ b/gnu/usr.bin/cvs/src/hardlink.c
@@ -41,96 +41,6 @@ List *hardlist;		/* Record hardlink information for working files */
 char *working_dir;	/* The top-level working directory, used for
 			   constructing full pathnames. */
 
-/* For check_link_proc: list all of the files named in an inode list. */
-static int
-list_files_proc (node, vstrp)
-    Node *node;
-    void *vstrp;
-{
-    char **strp, *file;
-    int len;
-
-    /* Get the file's basename.  This is because -- VERY IMPORTANT --
-       the `hardlinks' field is presently defined only to include links
-       within a directory.  So the hardlinks field might be `foo' or
-       `mumble grump flink', but not `foo bar com/baz' or `wham ../bam
-       ../thank/you'.  Someday it would be nice to extend this to
-       permit cross-directory links, but the issues involved are
-       hideous. */
-
-    file = strrchr (node->key, '/');
-    if (file)
-	++file;
-    else
-	file = node->key;
-
-    /* Is it safe to cast vstrp to (char **) here, and then play with
-       the contents?  I think so, since vstrp will have started out
-       a char ** to begin with, so we should not have alignment bugs. */
-    strp = (char **) vstrp;
-    len = (*strp == NULL ? 0 : strlen (*strp));
-    *strp = (char *) xrealloc (*strp, len + strlen (file) + 2);
-    if (*strp == NULL)
-    {
-	error (0, errno, "could not allocate memory");
-	return 1;
-    }
-    if (sprintf (*strp + len, "%s ", file) < 0)
-    {
-	error (0, errno, "could not compile file list");
-	return 1;
-    }
-
-    return 0;
-}    
-
-/* Set the link field of each hardlink_info node to `data', which is a
-   list of linked files. */
-static int
-set_hardlink_field_proc (node, data)
-    Node *node;
-    void *data;
-{
-    struct hardlink_info *hlinfo = (struct hardlink_info *) node->data;
-    hlinfo->links = xstrdup ((char *) data);
-
-    return 0;
-}
-
-/* For each file being checked in, compile a list of the files linked
-   to it, and cache the list in the file's hardlink_info field. */
-int
-cache_hardlinks_proc (node, data)
-    Node *node;
-    void *data;
-{
-    List *inode_links;
-    char *p, *linked_files = NULL;
-    int err;
-
-    inode_links = (List *) node->data;
-
-    /* inode->data is a list of hardlink_info structures: all the
-       files linked to this inode.  We compile a string of each file
-       named in this list, in alphabetical order, separated by spaces.
-       Then store this string in the `links' field of each
-       hardlink_info structure, so that RCS_checkin can easily add
-       it to the `hardlinks' field of a new delta node. */
-
-    sortlist (inode_links, fsortcmp);
-    err = walklist (inode_links, list_files_proc, &linked_files);
-    if (err)
-	return err;
-
-    /* Trim trailing whitespace. */
-    p = linked_files + strlen(linked_files) - 1;
-    while (p > linked_files && isspace (*p))
-	*p-- = '\0';
-
-    err = walklist (inode_links, set_hardlink_field_proc, linked_files);
-    return err;
-}
-
 /* Return a pointer to FILEPATH's node in the hardlist.  This means
    looking up its inode, retrieving the list of files linked to that
    inode, and then looking up FILE in that list.  If the file doesn't
@@ -237,26 +147,28 @@ update_hardlink_info (file)
     hlinfo = (struct hardlink_info *) n->data;
     hlinfo->status = T_UPTODATE;
     hlinfo->checked_out = 1;
-    hlinfo->links = NULL;
 }
 
-/* Return a string listing all the files known to be linked to FILE in
+/* Return a List with all the files known to be linked to FILE in
    the working directory.  Used by special_file_mismatch, to determine
-   whether it is safe to merge two files. */
-char *
-list_files_linked_to (file)
-    const char *file;
+   whether it is safe to merge two files.
+
+   FIXME: What is the memory allocation for the return value?  We seem
+   to sometimes allocate a new list (getlist() call below) and sometimes
+   return an existing list (where we return n->data).  */
+List *
+list_linked_files_on_disk (file)
+    char *file;
 {
-    char *inodestr, *filelist, *path;
+    char *inodestr, *path;
     struct stat sb;
     Node *n;
-    int err;
 
     /* If hardlist is NULL, we have not been doing an operation that
        would permit us to know anything about the file's hardlinks
-       (cvs update, cvs commit, etc).  Return an empty string. */
+       (cvs update, cvs commit, etc).  Return an empty list. */
     if (hardlist == NULL)
-	return xstrdup ("");
+	return getlist();
 
     /* Get the full pathname of file (assuming the working directory) */
     if (file[0] == '/')
@@ -288,11 +200,107 @@ list_files_linked_to (file)
     n = findnode (hardlist, inodestr);
     sortlist ((List *) n->data, fsortcmp);
 
-    filelist = NULL;
-    err = walklist ((List *) n->data, list_files_proc, &filelist);
-    if (err)
-	error (1, 0, "cannot get list of hardlinks for %s", file);
-
     free (inodestr);
-    return filelist;
+    return (List *) n->data;
 }
+
+/* Compare the files in the `key' fields of two lists, returning 1 if
+   the lists are equivalent and 0 otherwise.
+
+   Only the basenames of each file are compared. This is an awful hack
+   that exists because list_linked_files_on_disk returns full paths
+   and the `hardlinks' structure of a RCSVers node contains only
+   basenames.  That in turn is a result of the awful hack that only
+   basenames are stored in the RCS file.  If anyone ever solves the
+   problem of correctly managing cross-directory hardlinks, this
+   function (along with most functions in this file) must be fixed. */
+						      
+int
+compare_linkage_lists (links1, links2)
+    List *links1;
+    List *links2;
+{
+    Node *n1, *n2;
+    char *p1, *p2;
+
+    sortlist (links1, fsortcmp);
+    sortlist (links2, fsortcmp);
+
+    n1 = links1->list->next;
+    n2 = links2->list->next;
+
+    while (n1 != links1->list && n2 != links2->list)
+    {
+	/* Get the basenames of both files. */
+	p1 = strrchr (n1->key, '/');
+	if (p1 == NULL)
+	    p1 = n1->key;
+	else
+	    ++p1;
+
+	p2 = strrchr (n2->key, '/');
+	if (p2 == NULL)
+	    p2 = n2->key;
+	else
+	    ++p2;
+
+	/* Compare the files' basenames. */
+	if (strcmp (p1, p2) != 0)
+	    return 0;
+
+	n1 = n1->next;
+	n2 = n2->next;
+    }
+
+    /* At this point we should be at the end of both lists; if not,
+       one file has more links than the other, and return 1. */
+    return (n1 == links1->list && n2 == links2->list);
+}
+
+/* Find a checked-out file in a list of filenames.  Used by RCS_checkout
+   when checking out a new hardlinked file, to decide whether this file
+   can be linked to any others that already exist.  The return value
+   is not currently used. */
+
+int
+find_checkedout_proc (node, data)
+    Node *node;
+    void *data;
+{
+    Node **uptodate = (Node **) data;
+    Node *link;
+    char *dir = xgetwd();
+    char *path;
+    struct hardlink_info *hlinfo;
+
+    /* If we have already found a file, don't do anything. */
+    if (*uptodate != NULL)
+	return 0;
+
+    /* Look at this file in the hardlist and see whether the checked_out
+       field is 1, meaning that it has been checked out during this CVS run. */
+    path = (char *)
+	xmalloc (sizeof(char) * (strlen (dir) + strlen (node->key) + 2));
+    sprintf (path, "%s/%s", dir, node->key);
+    link = lookup_file_by_inode (path);
+    free (path);
+    free (dir);
+
+    if (link == NULL)
+    {
+	/* We haven't seen this file -- maybe it hasn't been checked
+	   out yet at all. */
+	return 0;
+    }
+
+    hlinfo = (struct hardlink_info *) link->data;
+    if (hlinfo->checked_out)
+    {
+	/* This file has been checked out recently, so it's safe to
+           link to it. */
+	*uptodate = link;
+    }
+
+    return 0;
+}
+
diff --git a/gnu/usr.bin/cvs/src/hardlink.h b/gnu/usr.bin/cvs/src/hardlink.h
index cce3f33a265..f9df34448ed 100644
--- a/gnu/usr.bin/cvs/src/hardlink.h
+++ b/gnu/usr.bin/cvs/src/hardlink.h
@@ -21,13 +21,13 @@ struct hardlink_info
 {
     Ctype status;		/* as returned from Classify_File() */
     int checked_out;		/* has this file been checked out lately? */
-    char *links;		/* contents of `hardlinks' RCS field */
 };
 
 extern List *hardlist;
 extern char *working_dir;
 
-int cache_hardlinks_proc PROTO ((Node *, void *));
 Node *lookup_file_by_inode PROTO ((const char *));
 void update_hardlink_info PROTO ((const char *));
-char *list_files_linked_to PROTO ((const char *));
+List *list_linked_files_on_disk PROTO ((char *));
+int compare_linkage_lists PROTO ((List *, List *));
+int find_checkedout_proc PROTO ((Node *, void *));
diff --git a/gnu/usr.bin/cvs/src/history.c b/gnu/usr.bin/cvs/src/history.c
index 223e5a770fb..8f1e254720e 100644
--- a/gnu/usr.bin/cvs/src/history.c
+++ b/gnu/usr.bin/cvs/src/history.c
@@ -200,7 +200,6 @@ static int accept_hrec PROTO((struct hrec * hr, struct hrec * lr));
 static int select_hrec PROTO((struct hrec * hr));
 static int sort_order PROTO((const PTR l, const PTR r));
 static int within PROTO((char *find, char *string));
-static time_t date_and_time PROTO((char *date_str));
 static void expand_modules PROTO((void));
 static void read_hrecs PROTO((char *fname));
 static void report_hrecs PROTO((void));
@@ -242,8 +241,8 @@ static char *tz_name = "+0000";
 static char *since_rev;
 static char *since_tag;
 static char *backto;
-/* -D option, or 0 if not specified.  */
-static time_t since_date;
+/* -D option, or 0 if not specified.  RCS format.  */
+static char * since_date;
 
 static struct hrec *last_since_tag;
 static struct hrec *last_backto;
@@ -364,18 +363,6 @@ sort_order (l, r)
     return (left->idx - right->idx);
 }
 
-static time_t
-date_and_time (date_str)
-    char *date_str;
-{
-    time_t t;
-
-    t = get_date (date_str, (struct timeb *) NULL);
-    if (t == (time_t) - 1)
-	error (1, 0, "Can't parse date/time: %s", date_str);
-    return (t);
-}
-
 int
 history (argc, argv)
     int argc;
@@ -432,14 +419,16 @@ history (argc, argv)
 		    error (0, 0, "date overriding rev/tag/backto");
 		    *since_rev = *since_tag = *backto = '\0';
 		}
-		since_date = date_and_time (optarg);
+		since_date = Make_Date (optarg);
 		break;
 	    case 'b':			/* Since specified file/Repos */
 		if (since_date || *since_rev || *since_tag)
 		{
 		    error (0, 0, "backto overriding date/rev/tag");
 		    *since_rev = *since_tag = '\0';
-		    since_date = 0;
+		    if (since_date != NULL)
+			free (since_date);
+		    since_date = NULL;
 		}
 		free (backto);
 		backto = xstrdup (optarg);
@@ -461,7 +450,9 @@ history (argc, argv)
 		{
 		    error (0, 0, "rev overriding date/tag/backto");
 		    *since_tag = *backto = '\0';
-		    since_date = 0;
+		    if (since_date != NULL)
+			free (since_date);
+		    since_date = NULL;
 		}
 		free (since_rev);
 		since_rev = xstrdup (optarg);
@@ -471,7 +462,9 @@ history (argc, argv)
 		{
 		    error (0, 0, "tag overriding date/marker/file/repos");
 		    *since_rev = *backto = '\0';
-		    since_date = 0;
+		    if (since_date != NULL)
+			free (since_date);
+		    since_date = NULL;
 		}
 		free (since_tag);
 		since_tag = xstrdup (optarg);
@@ -564,7 +557,7 @@ history (argc, argv)
 	if (histfile)
 	    send_arg("-X");
 	if (since_date)
-	    option_with_arg ("-D", asctime (gmtime (&since_date)));
+	    client_senddate (since_date);
 	if (backto[0] != '\0')
 	    option_with_arg ("-b", backto);
 	for (f1 = file_list; f1 < &file_list[file_count]; ++f1)
@@ -683,6 +676,8 @@ history (argc, argv)
     qsort ((PTR) hrec_head, hrec_count, sizeof (struct hrec), sort_order);
     report_hrecs ();
     free (fname);
+    if (since_date != NULL)
+	free (since_date);
     free (since_rev);
     free (since_tag);
     free (backto);
@@ -1157,7 +1152,7 @@ select_hrec (hr)
     /* "Since" checking:  The argument parser guarantees that only one of the
      *			  following four choices is set:
      *
-     * 1. If "since_date" is set, it contains a Unix time_t specified on the
+     * 1. If "since_date" is set, it contains the date specified on the
      *    command line. hr->date fields earlier than "since_date" are ignored.
      * 2. If "since_rev" is set, it contains either an RCS "dotted" revision
      *    number (which is of limited use) or a symbolic TAG.  Each RCS file
@@ -1177,8 +1172,12 @@ select_hrec (hr)
      */
     if (since_date)
     {
-	if (hr->date < since_date)
+	char *ourdate = date_from_time_t (hr->date);
+
+	if (RCS_datecmp (ourdate, since_date) < 0)
 	    return (0);
+
+	free (ourdate);
     }
     else if (*since_rev)
     {
diff --git a/gnu/usr.bin/cvs/src/import.c b/gnu/usr.bin/cvs/src/import.c
index d79a10e3146..77c617a195c 100644
--- a/gnu/usr.bin/cvs/src/import.c
+++ b/gnu/usr.bin/cvs/src/import.c
@@ -20,8 +20,6 @@
 #include "savecwd.h"
 #include <assert.h>
 
-#define	FILE_HOLDER	".#cvsxxx"
-
 static char *get_comment PROTO((char *user));
 static int add_rev PROTO((char *message, RCSNode *rcs, char *vfile,
 			  char *vers));
@@ -655,39 +653,15 @@ add_rev (message, rcs, vfile, vers)
 	RCS_rewrite (rcs, NULL, NULL);
     }
     tocvsPath = wrap_tocvs_process_file (vfile);
-    if (tocvsPath == NULL)
-    {
-	/* We play with hard links rather than passing -u to ci to avoid
-	   expanding RCS keywords (see test 106.5 in sanity.sh).  */
-	if (link_file (vfile, FILE_HOLDER) < 0)
-	{
-	    if (errno == EEXIST)
-	    {
-		(void) unlink_file (FILE_HOLDER);
-		(void) link_file (vfile, FILE_HOLDER);
-	    }
-	    else
-	    {
-		ierrno = errno;
-		fperror (logfp, 0, ierrno,
-			 "ERROR: cannot create link to %s", vfile);
-		error (0, ierrno, "ERROR: cannot create link to %s", vfile);
-		return (1);
-	    }
-	}
-    }
 
     status = RCS_checkin (rcs, tocvsPath == NULL ? vfile : tocvsPath,
 			  message, vbranch,
-			  (RCS_FLAGS_QUIET
+			  (RCS_FLAGS_QUIET | RCS_FLAGS_KEEPFILE
 			   | (use_file_modtime ? RCS_FLAGS_MODTIME : 0)));
     ierrno = errno;
 
-    if (tocvsPath == NULL)
-	rename_file (FILE_HOLDER, vfile);
-    else
-	if (unlink_file_dir (tocvsPath) < 0)
-		error (0, errno, "cannot remove %s", tocvsPath);
+    if ((tocvsPath != NULL) && (unlink_file_dir (tocvsPath) < 0))
+	error (0, errno, "cannot remove %s", tocvsPath);
 
     if (status)
     {
diff --git a/gnu/usr.bin/cvs/src/options.h.in b/gnu/usr.bin/cvs/src/options.h.in
index 144980e068a..67e8c40aa04 100644
--- a/gnu/usr.bin/cvs/src/options.h.in
+++ b/gnu/usr.bin/cvs/src/options.h.in
@@ -15,13 +15,12 @@
  * or the configure script directly.  Sorry.
  */
 
-/*
- * For portability and heterogeneity reasons, CVS is shipped by
- * default using my own text-file version of the ndbm database library
- * in the src/myndbm.c file.  If you want better performance and are
- * not concerned about heterogeneous hosts accessing your modules
- * file, turn this option off.
- */
+/* By default, CVS stores its modules and other such items in flat
+   text files (MY_NDBM enables this).  Turning off MY_NDBM causes CVS
+   to look for a system-supplied ndbm database library and use it
+   instead.  That may speed things up, but the default setting
+   generally works fine too.  */
+
 #ifndef MY_NDBM
 #define	MY_NDBM
 #endif
diff --git a/gnu/usr.bin/cvs/src/rcs.h b/gnu/usr.bin/cvs/src/rcs.h
index 400d1a0a13f..f92988f4b1e 100644
--- a/gnu/usr.bin/cvs/src/rcs.h
+++ b/gnu/usr.bin/cvs/src/rcs.h
@@ -154,6 +154,10 @@ struct rcsversnode
     List *other;
     /* Newphrase fields from delta nodes.  */
     List *other_delta;
+#ifdef PRESERVE_PERMISSIONS_SUPPORT
+    /* Hard link information for each revision. */
+    List *hardlinks;
+#endif
 };
 typedef struct rcsversnode RCSVers;
 
@@ -185,6 +189,9 @@ char *RCS_check_kflag PROTO((const char *arg));
 char *RCS_getdate PROTO((RCSNode * rcs, char *date, int force_tag_match));
 char *RCS_gettag PROTO((RCSNode * rcs, char *symtag, int force_tag_match,
 			int *simple_tag));
+int RCS_exist_rev PROTO((RCSNode *rcs, char *rev));
+int RCS_exist_tag PROTO((RCSNode *rcs, char *tag));
+char *RCS_tag2rev PROTO((RCSNode *rcs, char *tag));
 char *RCS_getversion PROTO((RCSNode * rcs, char *tag, char *date,
 		      int force_tag_match, int *simple_tag));
 char *RCS_magicrev PROTO((RCSNode *rcs, char *rev));
@@ -196,9 +203,11 @@ int RCS_datecmp PROTO((char *date1, char *date2));
 time_t RCS_getrevtime PROTO((RCSNode * rcs, char *rev, char *date, int fudge));
 List *RCS_symbols PROTO((RCSNode *rcs));
 void RCS_check_tag PROTO((const char *tag));
+int RCS_valid_rev PROTO ((char *rev));
 List *RCS_getlocks PROTO((RCSNode *rcs));
 void freercsnode PROTO((RCSNode ** rnodep));
 char *RCS_getbranch PROTO((RCSNode * rcs, char *tag, int force_tag_match));
+char *RCS_branch_head PROTO ((RCSNode *rcs, char *rev));
 
 int RCS_isdead PROTO((RCSNode *, const char *));
 char *RCS_getexpand PROTO ((RCSNode *));
diff --git a/gnu/usr.bin/cvs/src/recurse.c b/gnu/usr.bin/cvs/src/recurse.c
index 3896bc737a5..761c43eb0c1 100644
--- a/gnu/usr.bin/cvs/src/recurse.c
+++ b/gnu/usr.bin/cvs/src/recurse.c
@@ -586,7 +586,6 @@ do_dir_proc (p, closure)
     char *newrepos;
     List *sdirlist;
     char *srepository;
-    char *cp;
     Dtype dir_return = R_PROCESS;
     int stripped_dot = 0;
     int err = 0;
@@ -790,16 +789,8 @@ but CVS uses %s for its own purposes; skipping %s directory",
 	repository = srepository;
     }
 
-    /* Put back update_dir.  I think this is the same as just setting
-       update_dir back to saved_update_dir, but there are a few cases I'm
-       not sure about (in particular, if DIR is "." and update_dir is
-       not ""), so for conservatism I'm leaving this here.  */
-    cp = last_component (update_dir);
-    if (cp > update_dir)
-	cp[-1] = '\0';
-    else
-	update_dir[0] = '\0';
-    free (saved_update_dir);
+    free (update_dir);
+    update_dir = saved_update_dir;
 
     return (err);
 }
diff --git a/gnu/usr.bin/cvs/src/sanity.sh b/gnu/usr.bin/cvs/src/sanity.sh
index 1d877fee0b2..f378d73725f 100644
--- a/gnu/usr.bin/cvs/src/sanity.sh
+++ b/gnu/usr.bin/cvs/src/sanity.sh
@@ -552,18 +552,23 @@ if test x"$*" = x; then
 	tests="basica basicb basicc basic1 deep basic2"
 	# Branching, tagging, removing, adding, multiple directories
 	tests="${tests} rdiff death death2 branches branches2"
-	tests="${tests} rcslib multibranch import importb join join2 join3"
+	tests="${tests} rcslib multibranch import importb importc"
+	tests="${tests} join join2 join3"
 	tests="${tests} new newb conflicts conflicts2 conflicts3"
 	# Checking out various places (modules, checkout -d, &c)
 	tests="${tests} modules modules2 modules3 modules4"
-	tests="${tests} cvsadm abspath toplevel"
+	tests="${tests} cvsadm emptydir abspath toplevel"
 	# Log messages, error messages.
 	tests="${tests} mflag editor errmsg1 errmsg2"
 	# Watches, binary files, history browsing, &c.
 	tests="${tests} devcom devcom2 devcom3 watch4"
 	tests="${tests} ignore binfiles binfiles2 mcopy binwrap binwrap2"
 	tests="${tests} binwrap3 mwrap info config"
-	tests="${tests} serverpatch log log2 ann crerepos rcs big modes stamps"
+	tests="${tests} serverpatch log log2 ann crerepos rcs rcs2"
+	tests="${tests} history"
+	tests="${tests} big modes modes2 stamps"
+	# PreservePermissions stuff: permissions, symlinks et al.
+	tests="${tests} perms symlinks hardlinks"
 	# More tag and branch tests, keywords.
 	tests="${tests} sticky keyword keywordlog"
 	tests="${tests} head tagdate multibranch2"
@@ -1066,31 +1071,6 @@ done"
 	  cd ../..
 	  rm -r 1
 
-	  # Let's see if we can add something to Emptydir.
-	  dotest basicb-18 "${testcvs} -q co -d t2/t3 first-dir second-dir" \
-"U t2/t3/first-dir/Emptydir/sfile1
-U t2/t3/first-dir/sdir2/sfile2
-U t2/t3/second-dir/aa"
-	  cd t2
-	  touch emptyfile
-	  # The fact that CVS lets us add a file here is a CVS bug, right?
-	  # I can just make this an error message (on the add and/or the
-	  # commit) without getting flamed, right?
-	  # Right?
-	  # Right?
-	  dotest basicb-19 "${testcvs} add emptyfile" \
-"${PROG} [a-z]*: scheduling file .emptyfile. for addition
-${PROG} [a-z]*: use .${PROG} commit. to add this file permanently"
-	  dotest basicb-20 "${testcvs} -q ci -m add" \
-"RCS file: ${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v
-done
-Checking in emptyfile;
-${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v  <--  emptyfile
-initial revision: 1\.1
-done"
-	  cd ..
-	  rm -r t2
-
 	  mkdir 1; cd 1
 	  # Note that -H is an illegal option.
 	  # I suspect that the choice between "illegal" and "invalid"
@@ -1105,18 +1085,6 @@ ${PROG} \[admin aborted\]: specify ${PROG} -H admin for usage information"
 	  cd ..
 	  rmdir 1
 
-	  # OK, while we have an Emptydir around, test a few obscure
-	  # things about it.
-	  mkdir edir; cd edir
-	  dotest basicb-edir-1 "${testcvs} -q co -l CVSROOT" \
-"U CVSROOT${DOTSTAR}"
-	  cd CVSROOT
-	  dotest_fail basicb-edir-2 "test -d Emptydir" ''
-	  # This tests the code in find_dirs which skips Emptydir.
-	  dotest basicb-edir-3 "${testcvs} -q -n update -d -P" ''
-	  cd ../..
-	  rm -r edir
-
 	  if test "$keep" = yes; then
 	    echo Keeping ${TESTDIR} and exiting due to --keep
 	    exit 0
@@ -1124,7 +1092,6 @@ ${PROG} \[admin aborted\]: specify ${PROG} -H admin for usage information"
 
 	  rm -rf ${CVSROOT_DIRNAME}/first-dir
 	  rm -rf ${CVSROOT_DIRNAME}/second-dir
-	  rm -rf ${CVSROOT_DIRNAME}/CVSROOT/Emptydir
 	  rm -f ${CVSROOT_DIRNAME}/topfile,v
 	  ;;
 
@@ -3657,6 +3624,7 @@ modify-on-br1
 		# rdiff  -- imports with keywords
 		# import  -- more tests of imports with keywords
 		# importb  -- -b option.
+		# importc -- bunch o' files in bunch o' directories
 		# modules3
 		# mflag -- various -m messages
 		# ignore  -- import and cvsignore
@@ -3972,6 +3940,56 @@ add
 	  rm -rf ${CVSROOT_DIRNAME}/first-dir ${CVSROOT_DIRNAME}/second-dir
 	  ;;
 
+	importc)
+	  # Test importing a bunch o' files in a bunch o' directories.
+	  mkdir 1; cd 1
+	  mkdir adir bdir cdir
+	  mkdir adir/sub1 adir/sub2
+	  mkdir adir/sub1/ssdir
+	  mkdir bdir/subdir
+	  touch adir/sub1/file1 adir/sub2/file2 adir/sub1/ssdir/ssfile
+	  touch bdir/subdir/file1
+	  touch cdir/cfile
+	  dotest_sort importc-1 \
+"${testcvs} import -m import-it first-dir vendor release" \
+"
+
+N first-dir/adir/sub1/file1
+N first-dir/adir/sub1/ssdir/ssfile
+N first-dir/adir/sub2/file2
+N first-dir/bdir/subdir/file1
+N first-dir/cdir/cfile
+No conflicts created by this import
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub1
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub1/ssdir
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub2
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/bdir
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/bdir/subdir
+${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/cdir"
+	  cd ..
+	  mkdir 2; cd 2
+	  dotest importc-2 "${testcvs} -q co first-dir" \
+"U first-dir/adir/sub1/file1
+U first-dir/adir/sub1/ssdir/ssfile
+U first-dir/adir/sub2/file2
+U first-dir/bdir/subdir/file1
+U first-dir/cdir/cfile"
+	  cd first-dir
+	  dotest importc-3 "${testcvs} update adir/sub1" \
+"${PROG} [a-z]*: Updating adir/sub1
+${PROG} [a-z]*: Updating adir/sub1/ssdir"
+	  dotest importc-4 "${testcvs} update adir/sub1 bdir/subdir" \
+"${PROG} [a-z]*: Updating adir/sub1
+${PROG} [a-z]*: Updating adir/sub1/ssdir
+${PROG} [a-z]*: Updating bdir/subdir"
+	  cd ..
+
+	  cd ..
+	  rm -r 1 2
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+	  ;;
+
 	join)
 	  # Test doing joins which involve adding and removing files.
 	  #   Variety of scenarios (see list below), in the context of:
@@ -7287,68 +7305,71 @@ U dir/dir2d2-2/sub2d2-2/file2-2"
 	  ## on the command line, but use a longer path.
 	  ##################################################
 
+	  dotest_fail cvsadm-2d3-1 "${testcvs} co -d dir/dir2 1mod" \
+"${PROG} [a-z]*: cannot chdir to dir: No such file or directory
+${PROG} [a-z]*: ignoring module 1mod"
+
+	  if test "$remote" = no; then
+	  # Remote can't handle this, even with the "mkdir dir".
+	  # This was also true of CVS 1.9.
+
+	  mkdir dir
 	  dotest cvsadm-2d3 "${testcvs} co -d dir/dir2 1mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file1"
 	  dotest cvsadm-2d3b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d3d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
+	  dotest_fail cvsadm-2d3d "test -f dir/CVS/Repository" ""
 	  dotest cvsadm-2d3f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-2d4 "${testcvs} co -d dir/dir2 2mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file2"
 	  dotest cvsadm-2d4b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d4d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-2d4f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-2d5 "${testcvs} co -d dir/dir2 1d1mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file1"
 	  dotest cvsadm-2d5b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d5d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-2d5f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-2d6 "${testcvs} co -d dir/dir2 1d2mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file2"
 	  dotest cvsadm-2d6b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d6d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-2d6f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-2d7 "${testcvs} co -d dir/dir2 2d1mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file1"
 	  dotest cvsadm-2d7b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d7d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-2d7f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-2d8 "${testcvs} co -d dir/dir2 2d2mod" \
 "${PROG} [a-z]*: Updating dir/dir2
 U dir/dir2/file2"
 	  dotest cvsadm-2d8b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-2d8d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-2d8f "cat dir/dir2/CVS/Repository" \
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
@@ -7490,65 +7511,60 @@ U dir/dir2d2/sub2d2/file2"
 
 	  ## the ones in two-deep directories
 
+	  mkdir dir
 	  dotest cvsadm-N2d3 "${testcvs} co -N -d dir/dir2 1mod" \
 "${PROG} [a-z]*: Updating dir/dir2/1mod
 U dir/dir2/1mod/file1"
 	  dotest cvsadm-N2d3b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d3d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d3f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d3h "cat dir/dir2/1mod/CVS/Repository" \
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-N2d4 "${testcvs} co -N -d dir/dir2 2mod" \
 "${PROG} [a-z]*: Updating dir/dir2/2mod
 U dir/dir2/2mod/file2"
 	  dotest cvsadm-N2d4b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d4d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d4f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d4h "cat dir/dir2/2mod/CVS/Repository" \
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-N2d5 "${testcvs} co -N -d dir/dir2 1d1mod" \
 "${PROG} [a-z]*: Updating dir/dir2/dir1d1
 U dir/dir2/dir1d1/file1"
 	  dotest cvsadm-N2d5b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d5d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d5f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d5h "cat dir/dir2/dir1d1/CVS/Repository" \
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-N2d6 "${testcvs} co -N -d dir/dir2 1d2mod" \
 "${PROG} [a-z]*: Updating dir/dir2/dir1d2
 U dir/dir2/dir1d2/file2"
 	  dotest cvsadm-N2d6b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d6d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d6f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d6h "cat dir/dir2/dir1d2/CVS/Repository" \
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-N2d7 "${testcvs} co -N -d dir/dir2 2d1mod" \
 "${PROG} [a-z]*: Updating dir/dir2/dir2d1/sub2d1
 U dir/dir2/dir2d1/sub2d1/file1"
 	  dotest cvsadm-N2d7b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d7d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d7f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d7f "cat dir/dir2/dir2d1/CVS/Repository" \
@@ -7557,13 +7573,12 @@ U dir/dir2/dir2d1/sub2d1/file1"
 "${AREP}mod1"
 	  rm -rf CVS dir
 
+	  mkdir dir
 	  dotest cvsadm-N2d8 "${testcvs} co -N -d dir/dir2 2d2mod" \
 "${PROG} [a-z]*: Updating dir/dir2/dir2d2/sub2d2
 U dir/dir2/dir2d2/sub2d2/file2"
 	  dotest cvsadm-N2d8b "cat CVS/Repository" \
 "${AREP}\."
-	  dotest cvsadm-N2d8d "cat dir/CVS/Repository" \
-"${AREP}CVSROOT/Emptydir"
 	  dotest cvsadm-N2d8f "cat dir/dir2/CVS/Repository" \
 "${AREP}\."
 	  dotest cvsadm-N2d8h "cat dir/dir2/dir2d2/CVS/Repository" \
@@ -7572,6 +7587,8 @@ U dir/dir2/dir2d2/sub2d2/file2"
 "${AREP}mod2/sub2"
 	  rm -rf CVS dir
 
+	  fi # end of tests to be skipped for remote
+
 	  ##################################################
 	  ## That's enough of that, thank you very much.
 	  ##################################################
@@ -7589,6 +7606,89 @@ U dir/dir2/dir2d2/sub2d2/file2"
 	  rm -rf ${CVSROOT_DIRNAME}/mod2-2
 	  ;;
 
+	emptydir)
+	  # Various tests of the Emptydir (CVSNULLREPOS) code.  See also:
+	  #   cvsadm: tests of Emptydir in various module definitions
+	  #   basicb: Test that "Emptydir" is non-special in ordinary contexts
+
+	  mkdir 1; cd 1
+	  dotest emptydir-1 "${testcvs} co CVSROOT/modules" \
+"U CVSROOT/modules"
+	  echo "# Module defs for emptydir tests" > CVSROOT/modules
+	  echo "2d1mod -d dir2d1/sub2d1 mod1" >> CVSROOT/modules
+
+	  dotest emptydir-2 "${testcvs} ci -m add-modules" \
+"${PROG} [a-z]*: Examining .
+${PROG} [a-z]*: Examining CVSROOT
+Checking in CVSROOT/modules;
+${CVSROOT_DIRNAME}/CVSROOT/modules,v  <--  modules
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+done
+${PROG} [a-z]*: Rebuilding administrative file database"
+	  rm -rf CVS CVSROOT
+
+	  mkdir ${CVSROOT_DIRNAME}/mod1
+	  # Populate.  Not sure we really need to do this.
+	  dotest emptydir-3 "${testcvs} co mod1" \
+"${PROG} [a-z]*: Updating mod1"
+	  echo "file1" > mod1/file1
+	  dotest emptydir-4 "${testcvs} add mod1/file1" \
+"${PROG} [a-z]*: scheduling file .mod1/file1. for addition
+${PROG} [a-z]*: use '${PROG} commit' to add this file permanently"
+	  dotest emptydir-5 "${testcvs} -q ci -m yup mod1" \
+"RCS file: ${CVSROOT_DIRNAME}/mod1/file1,v
+done
+Checking in mod1/file1;
+${CVSROOT_DIRNAME}/mod1/file1,v  <--  file1
+initial revision: 1\.1
+done"
+	  rm -r mod1 CVS
+	  # End Populate.
+
+	  dotest emptydir-6 "${testcvs} co 2d1mod" \
+"${PROG} [a-z]*: Updating dir2d1/sub2d1
+U dir2d1/sub2d1/file1"
+	  cd dir2d1
+	  touch emptyfile
+	  # The fact that CVS lets us add a file here is a CVS bug, right?
+	  # I can just make this an error message (on the add and/or the
+	  # commit) without getting flamed, right?
+	  # Right?
+	  # Right?
+	  dotest emptydir-7 "${testcvs} add emptyfile" \
+"${PROG} [a-z]*: scheduling file .emptyfile. for addition
+${PROG} [a-z]*: use .${PROG} commit. to add this file permanently"
+	  dotest emptydir-8 "${testcvs} -q ci -m add" \
+"RCS file: ${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v
+done
+Checking in emptyfile;
+${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v  <--  emptyfile
+initial revision: 1\.1
+done
+${PROG} [a-z]*: Rebuilding administrative file database"
+	  cd ..
+	  rm -r CVS dir2d1
+
+	  # OK, while we have an Emptydir around, test a few obscure
+	  # things about it.
+	  mkdir edir; cd edir
+	  dotest emptydir-9 "${testcvs} -q co -l CVSROOT" \
+"U CVSROOT${DOTSTAR}"
+	  cd CVSROOT
+	  dotest_fail emptydir-10 "test -d Emptydir" ''
+	  # This tests the code in find_dirs which skips Emptydir.
+	  dotest emptydir-11 "${testcvs} -q -n update -d -P" ''
+	  cd ../..
+	  rm -r edir
+
+	  cd ..
+
+	  rm -r 1
+	  rm -rf ${CVSROOT_DIRNAME}/mod1
+	  # I guess for the moment the convention is going to be
+	  # that we don't need to remove ${CVSROOT_DIRNAME}/CVSROOT/Emptydir
+	  ;;
+
 	abspath)
 	
 	  # These tests test the thituations thin thwitch thoo theck
@@ -7632,9 +7732,17 @@ done"
 	  # Done.
 	  
 	  # Try checking out the module in a local directory
+	  if test "$remote" = yes; then
+	    dotest_fail abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \
+"${PROG} \[server aborted\]: absolute pathname .${TESTDIR}/1. illegal for server"
+	    dotest abspath-2a-try2 "${testcvs} co -d 1 mod1" \
+"${PROG} [a-z]*: Updating 1
+U 1/file1"
+	  else
 	  dotest abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \
 "${PROG} [a-z]*: Updating ${TESTDIR}/1
 U ${TESTDIR}/1/file1"
+	  fi # remote workaround
 
 	  # Are we relative or absolute in our Repository file?
 	  echo "${CVSROOT_DIRNAME}/mod1" > ${TESTDIR}/dotest.abs
@@ -7658,11 +7766,47 @@ U ${TESTDIR}/1/file1"
 	  # Now try in a subdirectory.  We're not covering any more
 	  # code here, but we might catch a future error if someone
 	  # changes the checkout code.
+
+	  # Note that for the same reason that the shell command
+	  # "touch 1/2/3" requires directories 1 and 1/2 to already
+	  # exist, we expect ${TESTDIR}/1 to already exist.  I believe
+	  # this is the behavior of CVS 1.9 and earlier.
+	  if test "$remote" = no; then
+	  dotest_fail abspath-3.1 "${testcvs} co -d ${TESTDIR}/1/2 mod1" \
+"${PROG} [a-z]*: cannot chdir to 1: No such file or directory
+${PROG} [a-z]*: ignoring module mod1"
+	  fi
+	  dotest_fail abspath-3.2 "${testcvs} co -d 1/2 mod1" \
+"${PROG} [a-z]*: cannot chdir to 1: No such file or directory
+${PROG} [a-z]*: ignoring module mod1"
+	  mkdir 1
+
+	  if test "$remote" = yes; then
+	    # The server wants the directory to exist, but that is
+	    # a bug, it should only need to exist on the client side.
+	    # See also cvsadm-2d3.
+	    dotest_fail abspath-3a "${testcvs} co -d 1/2 mod1" \
+"${PROG} [a-z]*: cannot chdir to 1: No such file or directory
+${PROG} [a-z]*: ignoring module mod1"
+	    cd 1
+	    dotest abspath-3a-try2 "${testcvs} co -d 2 mod1" \
+"${PROG} [a-z]*: Updating 2
+U 2/file1"
+	    cd ..
+	    rm -r 1/CVS
+	  else
 	  dotest abspath-3a "${testcvs} co -d ${TESTDIR}/1/2 mod1" \
 "${PROG} [a-z]*: Updating ${TESTDIR}/1/2
 U ${TESTDIR}/1/2/file1"
+	  fi # remote workaround
 	  dotest abspath-3b "cat ${TESTDIR}/1/2/CVS/Repository" \
 "${AREP}mod1"
+
+	  # For all the same reasons that we want "1" to already
+	  # exist, we don't to mess with it to traverse it, for
+	  # example by creating a CVS directory.
+
+	  dotest_fail abspath-3c "test -d ${TESTDIR}/1/CVS" ''
 	  # Done.  Clean up.
 	  rm -rf ${TESTDIR}/1
 
@@ -7670,19 +7814,32 @@ U ${TESTDIR}/1/2/file1"
 	  # Now try someplace where we don't have permission.
 	  mkdir ${TESTDIR}/barf
 	  chmod -w ${TESTDIR}/barf
-	  dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \
+	  if test "$remote" = yes; then
+	    dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \
+"${PROG} \[server aborted\]: absolute pathname .${TESTDIR}/barf/sub. illegal for server"
+	  else
+	    dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \
 "${PROG} \[[a-z]* aborted\]: cannot make directory sub: No such file or directory"
+	  fi
 	  chmod +w ${TESTDIR}/barf
 	  rmdir ${TESTDIR}/barf
 	  # Done.  Nothing to clean up.
 
 
 	  # Try checking out two modules into the same directory.
-	  dotest abspath-5a "${testcvs} co -d ${TESTDIR}/1 mod1 mod2" \
+	  if test "$remote" = yes; then
+	    dotest abspath-5a "${testcvs} co -d 1 mod1 mod2" \
+"${PROG} [a-z]*: Updating 1/mod1
+U 1/mod1/file1
+${PROG} [a-z]*: Updating 1/mod2
+U 1/mod2/file2"
+	  else
+	    dotest abspath-5a "${testcvs} co -d ${TESTDIR}/1 mod1 mod2" \
 "${PROG} [a-z]*: Updating ${TESTDIR}/1/mod1
 U ${TESTDIR}/1/mod1/file1
 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2
 U ${TESTDIR}/1/mod2/file2"
+	  fi # end remote workaround
 	  dotest abspath-5b "cat ${TESTDIR}/1/CVS/Repository" \
 "${AREP}."
 	  dotest abspath-5c "cat ${TESTDIR}/1/mod1/CVS/Repository" \
@@ -7694,7 +7851,17 @@ U ${TESTDIR}/1/mod2/file2"
 
 
 	  # Try checking out the top-level module.
-	  dotest abspath-6a "${testcvs} co -d ${TESTDIR}/1 ." \
+	  if test "$remote" = yes; then
+	    dotest abspath-6a "${testcvs} co -d 1 ." \
+"${PROG} [a-z]*: Updating 1
+${PROG} [a-z]*: Updating 1/CVSROOT
+${DOTSTAR}
+${PROG} [a-z]*: Updating 1/mod1
+U 1/mod1/file1
+${PROG} [a-z]*: Updating 1/mod2
+U 1/mod2/file2"
+	  else
+	    dotest abspath-6a "${testcvs} co -d ${TESTDIR}/1 ." \
 "${PROG} [a-z]*: Updating ${TESTDIR}/1
 ${PROG} [a-z]*: Updating ${TESTDIR}/1/CVSROOT
 ${DOTSTAR}
@@ -7702,6 +7869,7 @@ ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod1
 U ${TESTDIR}/1/mod1/file1
 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2
 U ${TESTDIR}/1/mod2/file2"
+	  fi # end of remote workaround
 	  dotest abspath-6b "cat ${TESTDIR}/1/CVS/Repository" \
 "${AREP}."
 	  dotest abspath-6c "cat ${TESTDIR}/1/CVSROOT/CVS/Repository" \
@@ -7713,17 +7881,45 @@ U ${TESTDIR}/1/mod2/file2"
 	  # Done.  Clean up.
 	  rm -rf ${TESTDIR}/1
 
+	  # Test that an absolute pathname to some other directory
+	  # doesn't mess with the current working directory.
+	  mkdir 1
+	  cd 1
+	  if test "$remote" = yes; then
+	    dotest_fail abspath-7a "${testcvs} -q co -d ../2 mod2" \
+"${PROG} server: protocol error: .\.\./2. contains more leading \.\.
+${PROG} \[server aborted\]: than the 0 which Max-dotdot specified"
+	    cd ..
+	    dotest abspath-7a-try2 "${testcvs} -q co -d 2 mod2" \
+"U 2/file2"
+	    cd 1
+	  else
+	  dotest abspath-7a "${testcvs} -q co -d ${TESTDIR}/2 mod2" \
+"U ${TESTDIR}/2/file2"
+	  fi # remote workaround
+	  dotest abspath-7b "ls" ""
+	  dotest abspath-7c "${testcvs} -q co mod1" \
+"U mod1/file1"
+	  cd mod1
+	  if test "$remote" = yes; then
+	    cd ../..
+	    dotest abspath-7d "${testcvs} -q co -d 3 mod2" \
+"U 3/file2"
+	    cd 1/mod1
+	  else
+	  dotest abspath-7d "${testcvs} -q co -d ${TESTDIR}/3 mod2" \
+"U ${TESTDIR}/3/file2"
+	  fi # remote workaround
+	  dotest abspath-7e "${testcvs} -q update -d" ""
+	  cd ../..
+	  rm -r 1 2 3
+
 	  #
 	  # FIXME: do other functions here (e.g. update /tmp/foo)
 	  #
 
 	  # Finished with all tests.  Remove the module.
-	  rm -rf ${CVSROOT_DIRNAME}/mod1 ${CVSROOT_DIRNAME}/mod1
-
-	  # FIXME: the absolute pathname fixes create CVS directories
-	  # wherever they can.  That means for the standard TESTDIR, a
-	  # /tmp/CVS directory will be created as well.  It's not safe
-	  # to remove it, however.
+	  rm -rf ${CVSROOT_DIRNAME}/mod1 ${CVSROOT_DIRNAME}/mod2
 
 	  ;;
 
@@ -7733,7 +7929,9 @@ U ${TESTDIR}/1/mod2/file2"
 
 	  # Some test, somewhere, is creating Emptydir.  That test
 	  # should, perhaps, clean up for itself, but I don't know which
-	  # one it is.
+	  # one it is (cvsadm, emptydir, &c).
+	  # (On the other hand, should CVS care whether there is an
+	  # Emptydir?  That would seem a bit odd).
 	  rm -rf ${CVSROOT_DIRNAME}/CVSROOT/Emptydir
 
 	  mkdir 1; cd 1
@@ -7894,7 +8092,7 @@ ${PROG} [a-z]*: Updating top-dir"
 	  cat >${TESTDIR}/editme <<EOF
 #!${TESTSHELL}
 sleep 1
-sed <\$1 -e 's/^/x&/g' >${TESTDIR}/edit.new
+sed <\$1 -e 's/^/x/' >${TESTDIR}/edit.new
 mv ${TESTDIR}/edit.new \$1
 exit 0
 EOF
@@ -10520,7 +10718,9 @@ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
 	  ;;
 
 	ann)
-	  # Tests of "cvs annotate".  See also basica-10.
+	  # Tests of "cvs annotate".  See also:
+	  #   basica-10  A simple annotate test
+	  #   rcs        Annotate and the year 2000
 	  mkdir 1; cd 1
 	  dotest ann-1 "${testcvs} -q co -l ." ''
 	  mkdir first-dir
@@ -10626,6 +10826,22 @@ done"
 1\.2          (${username} *[0-9a-zA-Z-]*): line
 1\.2\.2\.1      (${username} *[0-9a-zA-Z-]*): and some
 1\.2\.2\.1      (${username} *[0-9a-zA-Z-]*): branched content"
+	  # FIXCVS: shouldn't "-r 1.2.0.2" be the same as "-r br"?
+	  dotest ann-12 "${testcvs} ann -r 1.2.0.2 file1" ""
+	  dotest ann-13 "${testcvs} ann -r 1.2.2 file1" \
+"Annotations for file1
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
+1\.1          (${username} *[0-9a-zA-Z-]*): this
+1\.1          (${username} *[0-9a-zA-Z-]*): is
+1\.2          (${username} *[0-9a-zA-Z-]*): a
+1\.1          (${username} *[0-9a-zA-Z-]*): file
+1\.2          (${username} *[0-9a-zA-Z-]*): 
+1\.2          (${username} *[0-9a-zA-Z-]*): with
+1\.2          (${username} *[0-9a-zA-Z-]*): a
+1\.2          (${username} *[0-9a-zA-Z-]*): blank
+1\.2          (${username} *[0-9a-zA-Z-]*): line
+1\.2\.2\.1      (${username} *[0-9a-zA-Z-]*): and some
+1\.2\.2\.1      (${username} *[0-9a-zA-Z-]*): branched content"
 
 	  cd ../..
 	  rm -r 1
@@ -10984,8 +11200,33 @@ add file1
 	    fail rcs-4
 	  fi
 
+	  # Intended behavior for "cvs annotate" is that it displays the
+	  # last two digits of the year.  Make sure it does that rather
+	  # than some bogosity like "100".
+	  dotest rcs-4a "${testcvs} annotate file1" \
+"Annotations for file1
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
+1\.1          (kingdon  24-Nov-96): This is the first line
+1\.2          (kingdon  24-Nov-96): This is the third line
+1\.2          (kingdon  24-Nov-96): This is the fourth line
+1\.2          (kingdon  24-Nov-96): This is the fifth line
+1\.2          (kingdon  24-Nov-96): This is the sixth line
+1\.2          (kingdon  24-Nov-96): This is the seventh line
+1\.2          (kingdon  24-Nov-96): This is the eighth line
+1\.2          (kingdon  24-Nov-96): This is the ninth line
+1\.2          (kingdon  24-Nov-96): This is the tenth line
+1\.2          (kingdon  24-Nov-96): This is the eleventh line
+1\.3          (kingdon  24-Nov-00): This is the twelfth line (and what a line it is)
+1\.2          (kingdon  24-Nov-96): This is the thirteenth line"
+
+	  # Probably should split this test into two at this point (file1
+	  # above this line and file2 below), as the two share little
+	  # data/setup.
+
 	  # OK, here is another one.  This one was written by hand based on
-	  # doc/RCSFILES and friends.
+	  # doc/RCSFILES and friends.  One subtle point is that none of
+	  # the lines end with newlines; that is a feature which we
+	  # should be testing.
 	  cat <<EOF >${CVSROOT_DIRNAME}/first-dir/file2,v
 head			 	1.5                 ;
      branch        1.2.6;
@@ -11160,10 +11401,6 @@ a1 1
 next branch revision
 @"
 
-	  # For remote, the "update -p -D" usage seems not to work.
-	  # I'm not sure what is going on.
-	  if test "x$remote" = "xno"; then
-
 	  if ${testcvs} -q update -p -D '1970-12-31 11:30 UT' file2 \
 	      >${TESTDIR}/rcs4.tmp
 	  then
@@ -11206,8 +11443,6 @@ next branch revision
 	    fail rcs-13
 	  fi
 
-	  fi # end of tests skipped for remote
-
 	  # OK, now make sure cvs log doesn't have any trouble with the
 	  # newphrases and such.
 	  dotest rcs-14 "${testcvs} -q log file2" "
@@ -11258,6 +11493,143 @@ date: 1971/01/01 08:00:05;  author: joe;  state: Exp;  lines: ${PLUS}1 -1
 	  rm -rf ${CVSROOT_DIRNAME}/first-dir
 	  ;;
 
+	rcs2)
+	  # More date tests.  Might as well do this as a separate
+	  # test from "rcs", so that we don't need to perturb the
+	  # "written by RCS 5.7" RCS file.
+	  mkdir ${CVSROOT_DIRNAME}/first-dir
+	  # Significance of various dates:
+	  # * At least one Y2K standard refers to recognizing 9 Sep 1999
+	  #   (as an example of a pre-2000 date, I guess).
+	  # * At least one Y2K standard refers to recognizing 1 Jan 2001
+	  #   (as an example of a post-2000 date, I guess).
+	  # * Many Y2K standards refer to 2000 being a leap year.
+	  cat <<EOF >${CVSROOT_DIRNAME}/first-dir/file1,v
+head 1.7; access; symbols; locks; strict;
+1.7 date 2004.08.31.01.01.01; author sue; state; branches; next 1.6;
+1.6 date 2004.02.29.01.01.01; author sue; state; branches; next 1.5;
+1.5 date 2003.02.28.01.01.01; author sue; state; branches; next 1.4;
+1.4 date 2001.01.01.01.01.01; author sue; state; branches; next 1.3;
+1.3 date 2000.02.29.01.01.01; author sue; state; branches; next 1.2;
+1.2 date 99.09.09.01.01.01; author sue; state; branches; next 1.1;
+1.1 date 98.09.10.01.01.01; author sue; state; branches; next;
+desc @a test file@
+1.7 log @@ text @head revision@
+1.6 log @@ text @d1 1
+a1 1
+2004 was a great year for leaping@
+1.5 log @@ text @d1 1
+a1 1
+2003 wasn't@
+1.4 log @@ text @d1 1
+a1 1
+two year hiatus@
+1.3 log @@ text @d1 1
+a1 1
+2000 is also a good year for leaping@
+1.2 log @@ text @d1 1
+a1 1
+Tonight we're going to party like it's a certain year@
+1.1 log @@ text @d1 1
+a1 1
+Need to start somewhere@
+EOF
+	  dotest rcs2-1 "${testcvs} -q co first-dir" 'U first-dir/file1'
+	  cd first-dir
+
+	  # 9 Sep 1999
+	  if ${testcvs} -q update -p -D '1999-09-09 11:30 UT' file1 \
+	      >${TESTDIR}/rcs4.tmp
+	  then
+	    dotest rcs2-2 "cat ${TESTDIR}/rcs4.tmp" \
+"Tonight we're going to party like it's a certain year"
+	  else
+	    fail rcs2-2
+	  fi
+	  # 1 Jan 2001.
+	  if ${testcvs} -q update -p -D '2001-01-01 11:30 UT' file1 \
+	      >${TESTDIR}/rcs4.tmp
+	  then
+	    dotest rcs2-3 "cat ${TESTDIR}/rcs4.tmp" \
+"two year hiatus"
+	  else
+	    fail rcs2-3
+	  fi
+	  # 29 Feb 2000
+	  if ${testcvs} -q update -p -D '2000-02-29 11:30 UT' file1 \
+	      >${TESTDIR}/rcs4.tmp
+	  then
+	    dotest rcs2-4 "cat ${TESTDIR}/rcs4.tmp" \
+"2000 is also a good year for leaping"
+	  else
+	    fail rcs2-4
+	  fi
+	  # 29 Feb 2003 is invalid
+	  if ${testcvs} -q update -p -D '2003-02-29 11:30 UT' file1 \
+	      >${TESTDIR}/rcs4.tmp 2>&1
+	  then
+	    fail rcs2-5
+	  else
+	    dotest rcs2-5 "cat ${TESTDIR}/rcs4.tmp" \
+"${PROG} \[[a-z]* aborted\]: Can't parse date/time: 2003-02-29 11:30 UT"
+	  fi
+	  rm ${TESTDIR}/rcs4.tmp
+
+	  cd ..
+	  rm -r first-dir
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+	  ;;
+
+	history)
+	  # CVSROOT/history tests:
+	  # history: various "cvs history" invocations
+	  # basic2: Generating the CVSROOT/history file via CVS commands.
+
+	  # Put in some data for the history file (discarding what was
+	  # there before).  Note that this file format is fixed; the
+	  # user may wish to analyze data from a previous version of
+	  # CVS.  If we phase out this format, it should be done
+	  # slowly and carefully.
+	  cat >${CVSROOT_DIRNAME}/CVSROOT/history <<EOF
+O3395c677|anonymous|<remote>/*0|ccvs||ccvs
+M339cafae|nk|<remote>|ccvs/src|1.229|sanity.sh
+M339dc339|kingdon|~/work/*0|ccvs/src|1.231|sanity.sh
+W33a6eada|anonymous|<remote>*4|ccvs/emx||Makefile.in
+C3b235f50|kingdon|<remote>|ccvs/emx|1.3|README
+M3b23af50|kingdon|~/work/*0|ccvs/doc|1.281|cvs.texinfo
+EOF
+	  dotest history-1 "${testcvs} history -e -a" \
+"O 06/04 19:48 ${PLUS}0000 anonymous ccvs     =ccvs= <remote>/\*
+W 06/17 19:51 ${PLUS}0000 anonymous       Makefile\.in ccvs/emx == <remote>/emx
+M 06/10 21:12 ${PLUS}0000 kingdon   1\.231 sanity\.sh   ccvs/src == ~/work/ccvs/src
+C 06/10 11:51 ${PLUS}0000 kingdon   1\.3   README      ccvs/emx == <remote>
+M 06/10 17:33 ${PLUS}0000 kingdon   1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc
+M 06/10 01:36 ${PLUS}0000 nk        1\.229 sanity\.sh   ccvs/src == <remote>"
+	  if ${testcvs} history -e -a -D '10 Jun 1997 13:00 UT' \
+	      >${TESTDIR}/output.tmp
+	  then
+	    dotest history-2 "cat ${TESTDIR}/output.tmp" \
+"W 06/17 19:51 ${PLUS}0000 anonymous       Makefile\.in ccvs/emx == <remote>/emx
+M 06/10 21:12 ${PLUS}0000 kingdon   1\.231 sanity\.sh   ccvs/src == ~/work/ccvs/src
+C 06/10 11:51 ${PLUS}0000 kingdon   1\.3   README      ccvs/emx == <remote>
+M 06/10 17:33 ${PLUS}0000 kingdon   1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc"
+	  else
+	    fail history-2
+	  fi
+	  if ${testcvs} history -e -a -D '10 Jun 2001 13:00 UT' \
+	      >${TESTDIR}/output.tmp
+	  then
+	    # For reasons that are completely unclear to me, the number
+	    # of spaces betwen "kingdon" and "1.281" is different than
+	    # for the other tests.
+	    dotest history-3 "cat ${TESTDIR}/output.tmp" \
+"M 06/10 17:33 ${PLUS}0000 kingdon 1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc"
+	  else
+	    fail history-3
+	  fi
+	  rm ${TESTDIR}/output.tmp
+	  ;;
+
 	big)
 
 	  # Test ability to operate on big files.  Intention is to
@@ -11441,6 +11813,51 @@ done"
 	  # tests "should" not care about them...
 	  ;;
 
+	modes2)
+	  # More tests of file permissions in the working directory
+	  # and that sort of thing.
+
+	  # The usual setup, file first-dir/aa with two revisions.
+	  mkdir 1; cd 1
+	  dotest modes2-1 "${testcvs} -q co -l ." ''
+	  mkdir first-dir
+	  dotest modes2-2 "${testcvs} add first-dir" \
+"Directory ${TESTDIR}/cvsroot/first-dir added to the repository"
+	  cd first-dir
+	  touch aa
+	  dotest modes2-3 "${testcvs} add aa" \
+"${PROG} [a-z]*: scheduling file .aa. for addition
+${PROG} [a-z]*: use .${PROG} commit. to add this file permanently"
+	  dotest modes2-4 "${testcvs} -q ci -m add" \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/aa,v
+done
+Checking in aa;
+${TESTDIR}/cvsroot/first-dir/aa,v  <--  aa
+initial revision: 1\.1
+done"
+	  echo "more money" >> aa
+	  dotest modes2-5 "${testcvs} -q ci -m add" \
+"Checking in aa;
+${TESTDIR}/cvsroot/first-dir/aa,v  <--  aa
+new revision: 1\.2; previous revision: 1\.1
+done"
+
+	  # OK, here is the test.  The idea is to see what
+	  # No_Difference does if it can't open the file.
+	  chmod a= aa
+	  # If we don't change the st_mtime, CVS doesn't even try to read
+	  # the file.
+	  touch aa
+	  dotest_fail modes2-6 "${testcvs} -q update -r 1.1 aa" \
+"${PROG} \[update aborted\]: cannot open file aa for comparing: Permission denied" \
+"${PROG} \[update aborted\]: reading aa: Permission denied"
+
+	  chmod u+rwx aa
+	  cd ../..
+	  rm -r 1
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+	  ;;
+
 	stamps)
 	  # Test timestamps.
 	  mkdir 1; cd 1
@@ -11581,6 +11998,202 @@ done"
 	  rm -rf ${CVSROOT_DIRNAME}/first-dir
 	  ;;
 
+	perms)
+	  # short cut around checking out and committing CVSROOT
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+
+	  mkdir 1; cd 1
+	  dotest perms-1 "${testcvs} -q co -l ." ''
+	  mkdir first-dir
+	  dotest perms-2 "${testcvs} add first-dir" \
+"Directory ${TESTDIR}/cvsroot/first-dir added to the repository"
+	  cd first-dir
+
+	  touch foo
+	  chmod 431 foo
+	  dotest perms-3 "${testcvs} add foo" \
+"${PROG} [a-z]*: scheduling file .foo. for addition
+${PROG} [a-z]*: use .${PROG} commit. to add this file permanently"
+	  dotest perms-4 "${testcvs} -q ci -m ''" \
+"RCS file: ${CVSROOT_DIRNAME}/first-dir/foo,v
+done
+Checking in foo;
+${TESTDIR}/cvsroot/first-dir/foo,v  <--  foo
+initial revision: 1\.1
+done"
+
+	  # Test checking out files with different permissions.
+	  cd ../..
+	  mkdir 2; cd 2
+	  dotest perms-5 "${testcvs} -q co first-dir" "U first-dir/foo"
+	  cd first-dir
+	  if test "$remote" = no; then
+	    # PreservePermissions not yet implemented for remote.
+	    dotest perms-6 "ls -l foo" "-r---wx--x .* foo"
+	  fi
+
+	  cd ../..
+	  rm -rf 1 2
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  touch ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+	  ;;
+
+	symlinks)
+	  # short cut around checking out and committing CVSROOT
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+
+	  mkdir 1; cd 1
+	  dotest symlinks-1 "${testcvs} -q co -l ." ''
+	  mkdir first-dir
+	  dotest symlinks-2 "${testcvs} add first-dir" \
+"Directory ${TESTDIR}/cvsroot/first-dir added to the repository"
+	  cd first-dir
+
+	  dotest symlinks-2.1 "ln -s ${TESTDIR}/fumble slink" ""
+	  dotest symlinks-3 "${testcvs} add slink" \
+"${PROG} [a-z]*: scheduling file .slink. for addition
+${PROG} [a-z]*: use .${PROG} commit. to add this file permanently"
+	  if test "$remote" = yes; then
+	    # Remote doesn't implement PreservePermissions, and in its
+	    # absence the correct behavior is to follow the symlink.
+	    dotest_fail symlinks-4 "${testcvs} -q ci -m ''" \
+"${PROG} \[commit aborted\]: reading slink: No such file or directory"
+	  else
+	    dotest symlinks-4 "${testcvs} -q ci -m ''" \
+"RCS file: ${CVSROOT_DIRNAME}/first-dir/slink,v
+done
+Checking in slink;
+${TESTDIR}/cvsroot/first-dir/slink,v  <--  slink
+initial revision: 1\.1
+done"
+
+	    # Test checking out symbolic links.
+	    cd ../..
+	    mkdir 2; cd 2
+	    dotest symlinks-5 "${testcvs} -q co first-dir" "U first-dir/slink"
+	    cd first-dir
+	    dotest symlinks-6 "ls -l slink" \
+"l[rwx\-]* .* slink -> ${TESTDIR}/fumble"
+	  fi
+
+	  cd ../..
+	  rm -rf 1 2
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  touch ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+	  ;;
+
+	hardlinks)
+	  # short cut around checking out and committing CVSROOT
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+
+	  mkdir 1; cd 1
+	  dotest hardlinks-1 "${testcvs} -q co -l ." ''
+	  mkdir first-dir
+	  dotest hardlinks-2 "${testcvs} add first-dir" \
+"Directory ${TESTDIR}/cvsroot/first-dir added to the repository"
+	  cd first-dir
+
+	  # Make up some ugly filenames, to test that they get
+	  # encoded properly in the delta nodes.  Note that `dotest' screws
+	  # up if some arguments have embedded spaces.
+	  if touch aaaa
+	  then
+	    pass hardlinks-2.1
+	  else
+	    fail hardlinks-2.1
+	  fi
+
+	  if ln aaaa b.b.b.b
+	  then
+	    pass hardlinks-2.2
+	  else
+	    fail hardlinks-2.2
+	  fi
+
+	  if ln aaaa 'dd dd dd'
+	  then
+	    pass hardlinks-2.3
+	  else
+	    fail hardlinks-2.3
+	  fi
+
+	  dotest hardlinks-3 "${testcvs} add [abd]*" \
+"${PROG} [a-z]*: scheduling file .aaaa. for addition
+${PROG} [a-z]*: scheduling file .b\.b\.b\.b. for addition
+${PROG} [a-z]*: scheduling file .dd dd dd. for addition
+${PROG} [a-z]*: use .${PROG} commit. to add these files permanently"
+	  dotest hardlinks-4 "${testcvs} -q ci -m ''" \
+"RCS file: ${CVSROOT_DIRNAME}/first-dir/aaaa,v
+done
+Checking in aaaa;
+${TESTDIR}/cvsroot/first-dir/aaaa,v  <--  aaaa
+initial revision: 1\.1
+done
+RCS file: ${CVSROOT_DIRNAME}/first-dir/b\.b\.b\.b,v
+done
+Checking in b\.b\.b\.b;
+${TESTDIR}/cvsroot/first-dir/b\.b\.b\.b,v  <--  b\.b\.b\.b
+initial revision: 1\.1
+done
+RCS file: ${CVSROOT_DIRNAME}/first-dir/dd dd dd,v
+done
+Checking in dd dd dd;
+${TESTDIR}/cvsroot/first-dir/dd dd dd,v  <--  dd dd dd
+initial revision: 1\.1
+done"
+	  # Test checking out hardlinked files.
+	  cd ../..
+	  mkdir 2; cd 2
+	  if test "$remote" = yes; then
+	    # Remote does not implement PreservePermissions.
+	    dotest hardlinks-5 "${testcvs} -q co first-dir" \
+"U first-dir/aaaa
+U first-dir/b\.b\.b\.b
+U first-dir/dd dd dd"
+	    cd first-dir
+	    dotest hardlinks-6 "ls -l [abd]*" \
+"-[rwx\-]* *1 .* aaaa
+-[rwx\-]* *1 .* b\.b\.b\.b
+-[rwx\-]* *1 .* dd dd dd"
+	  else
+	    dotest hardlinks-5 "${testcvs} -q co first-dir" \
+"U first-dir/aaaa
+U first-dir/b\.b\.b\.b
+U first-dir/dd dd dd"
+	    cd first-dir
+	    # To make sure that the files are properly hardlinked, it
+	    # would be nice to do `ls -i' and make sure all the inodes
+	    # match.  But I think that would require expr to support
+	    # tagged regexps, and I don't think we can rely on that.
+	    # So instead we just see that each file has the right
+	    # number of links. -twp
+	    dotest hardlinks-6 "ls -l [abd]*" \
+"-[rwx\-]* *3 .* aaaa
+-[rwx\-]* *3 .* b\.b\.b\.b
+-[rwx\-]* *3 .* dd dd dd"
+	  fi
+
+	  cd ../..
+	  rm -rf 1 2
+	  rm -rf ${CVSROOT_DIRNAME}/first-dir
+
+	  rm -f ${CVSROOT_DIRNAME}/CVSROOT/config
+	  touch ${CVSROOT_DIRNAME}/CVSROOT/config
+	  chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config
+	  ;;
+
 	sticky)
 	  # More tests of sticky tags, particularly non-branch sticky tags.
 	  # See many tests (e.g. multibranch) for ordinary sticky tag
@@ -12131,24 +12744,11 @@ add a line on trunk after trunktag"
 "imported contents
 add a line on trunk
 add a line on trunk after trunktag"
-	  # But diff thinks that HEAD is "brtag".  Case (c) from
-	  # cvs.texinfo (the "strange, maybe accidental" case).
-	  dotest_fail head-brtag-diff "${testcvs} -q diff -c -r HEAD -r br1" \
-"Index: file1
-===================================================================
-RCS file: ${TESTDIR}/cvsroot/first-dir/file1,v
-retrieving revision 1\.3\.2\.1
-retrieving revision 1\.3\.2\.2
-diff -c -r1\.3\.2\.1 -r1\.3\.2\.2
-\*\*\* file1	[0-9/]* [0-9:]*	1\.3\.2\.1
---- file1	[0-9/]* [0-9:]*	1\.3\.2\.2
-\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
-\*\*\* 2,4 \*\*\*\*
---- 2,5 ----
-  add a line on trunk
-  add a line on trunk after trunktag
-  modify on branch
-${PLUS} modify on branch after brtag"
+
+	  # CVS 1.9 and older thought that HEAD is "brtag" (this was
+	  # noted as "strange, maybe accidental").  But "br1" makes a
+	  # whole lot more sense.
+	  dotest head-brtag-diff "${testcvs} -q diff -c -r HEAD -r br1" ""
 
 	  # With a nonbranch sticky tag on the trunk, HEAD is the head
 	  # of the trunk, I think.
@@ -12160,24 +12760,23 @@ add a line on trunk"
 "imported contents
 add a line on trunk
 add a line on trunk after trunktag"
-	  # Like head-brtag-diff, HEAD is the sticky tag.  Similarly
-	  # questionable.
+	  # Like head-brtag-diff, there is a non-branch sticky tag.
 	  dotest_fail head-trunktag-diff \
 	    "${testcvs} -q diff -c -r HEAD -r br1" \
 "Index: file1
 ===================================================================
 RCS file: ${TESTDIR}/cvsroot/first-dir/file1,v
-retrieving revision 1\.2
+retrieving revision 1\.3
 retrieving revision 1\.3\.2\.2
-diff -c -r1\.2 -r1\.3\.2\.2
-\*\*\* file1	[0-9/]* [0-9:]*	1\.2
+diff -c -r1\.3 -r1\.3\.2\.2
+\*\*\* file1	[0-9/]* [0-9:]*	1\.3
 --- file1	[0-9/]* [0-9:]*	1\.3\.2\.2
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
-\*\*\* 1,2 \*\*\*\*
+\*\*\* 1,3 \*\*\*\*
 --- 1,5 ----
   imported contents
   add a line on trunk
-${PLUS} add a line on trunk after trunktag
+  add a line on trunk after trunktag
 ${PLUS} modify on branch
 ${PLUS} modify on branch after brtag"
 
@@ -12996,6 +13595,192 @@ text
 add a line on the branch
 @"
 
+	  # Tests of cvs admin -n.  Make use of the results of
+	  # admin-1 through admin-25.
+	  # FIXME: We probably shouldn't make use of those results;
+	  # this test is way too long as it is.
+
+	  # tagtwo should be a revision
+	  #
+	  dotest admin-26-1 "${testcvs} admin -ntagtwo:tagone file2" \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+      	  
+	  # br1 should be a branch
+	  #
+	  dotest admin-26-2 "${testcvs} admin -nbr1:br file2" \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+      	  
+	  # Attach some tags using RCS versions
+	  #
+	  dotest admin-26-3 "${testcvs} admin -ntagthree:1.1 file2" \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+
+	  dotest admin-26-4 "${testcvs} admin -nbr2:1.1.2 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+
+	  dotest admin-26-5 "${testcvs} admin -nbr4:1.1.0.2 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+      	  
+	  # Check results so far
+	  #
+	  dotest admin-26-6 "${testcvs} status -v file2" \
+"===================================================================
+File: file2            	Status: Up-to-date
+
+   Working revision:	1\.2.*
+   Repository revision:	1\.2	${TESTDIR}/cvsroot/first-dir/file2,v
+   Sticky Tag:		(none)
+   Sticky Date:		(none)
+   Sticky Options:	(none)
+
+   Existing Tags:
+	br4                      	(branch: 1\.1\.2)
+	br2                      	(branch: 1\.1\.2)
+	tagthree                 	(revision: 1\.1)
+	br1                      	(branch: 1\.1\.2)
+	tagtwo                   	(revision: 1\.1)
+	tagone                   	(revision: 1\.1)
+	br                       	(branch: 1\.1\.2)"
+
+      	  
+	  # Add a couple more revisions
+	  #
+	  echo "nuthr_line" >> file2
+	  dotest admin-27-1 "${testcvs} commit -m nuthr_line file2"  \
+"Checking in file2;
+${TESTDIR}/cvsroot/first-dir/file2,v  <--  file2
+new revision: 1\.3; previous revision: 1\.2
+done"
+
+	  echo "yet_another" >> file2
+	  dotest admin-27-2 "${testcvs} commit -m yet_another file2"  \
+"Checking in file2;
+${TESTDIR}/cvsroot/first-dir/file2,v  <--  file2
+new revision: 1\.4; previous revision: 1\.3
+done"
+      	  
+	  # Fail trying to reattach existing tag with -n
+	  #
+	  dotest admin-27-3 "${testcvs} admin -ntagfour:1.1 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+
+	  dotest_fail admin-27-4 "${testcvs} admin -ntagfour:1.3 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} [a-z]*: ${TESTDIR}/cvsroot/first-dir/file2,v: symbolic name tagfour already bound to 1\.1
+${PROG} [a-z]*: cannot modify RCS file for .file2."
+      	  
+	  # Succeed at reattaching existing tag, using -N
+	  #
+	  dotest admin-27-5 "${testcvs} admin -Ntagfour:1.3 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+done"
+      	  
+	  # Fail on some bogus operations
+	  # Try to attach to nonexistant tag
+	  #
+	  dotest_fail admin-28-1 "${testcvs} admin -ntagsix:tagfive file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: tag .tagfive. does not exist"
+      	  
+	  # Try a some nonexisting numeric target tags
+	  #
+	  dotest_fail admin-28-2 "${testcvs} admin -ntagseven:2.1 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: revision .2\.1. does not exist"
+
+	  dotest_fail admin-28-3 "${testcvs} admin -ntageight:2.1.2 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: revision .2\.1\.2. does not exist"
+      	  
+	  # Try some invalid targets
+	  #
+	  dotest_fail admin-28-4 "${testcvs} admin -ntagnine:1.a.2 file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: tag .1\.a\.2. must start with a letter"
+
+	  dotest_fail admin-28-5 "${testcvs} admin -ntagten:BO+GUS file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: tag .BO${PLUS}GUS. does not exist"
+      	  
+	  dotest_fail admin-28-6 "${testcvs} admin -nq.werty:tagfour file2"  \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v
+${PROG} \[[a-z]* aborted\]: tag .q\.werty. must not contain the characters ..*"
+
+	  # Verify the archive
+	  #
+	  dotest admin-29 "cat ${TESTDIR}/cvsroot/first-dir/file2,v" \
+"head	1\.4;
+access
+	auth3
+	auth2
+	foo;
+symbols
+	tagfour:1\.3
+	br4:1\.1\.0\.2
+	br2:1\.1\.0\.2
+	tagthree:1\.1
+	br1:1\.1\.0\.2
+	tagtwo:1\.1
+	tagone:1\.1
+	br:1\.1\.0\.2;
+locks; strict;
+comment	@# @;
+
+
+1\.4
+date	[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9];	author ${username};	state Exp;
+branches;
+next	1\.3;
+
+1\.3
+date	[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9];	author ${username};	state Exp;
+branches;
+next	1\.2;
+
+1\.2
+date	[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9];	author ${username};	state Exp;
+branches;
+next	;
+
+
+desc
+@@
+
+
+1\.4
+log
+@yet_another
+@
+text
+@add a line
+nuthr_line
+yet_another
+@
+
+
+1\.3
+log
+@nuthr_line
+@
+text
+@d3 1
+@
+
+
+1\.2
+log
+@modify
+@
+text
+@d2 1
+@"
+
 	  cd ../..
 	  rm -r 1
 	  rm -rf ${CVSROOT_DIRNAME}/first-dir
@@ -13141,6 +13926,11 @@ ${PROG} [a-z]*: Rebuilding administrative file database"
 "fred has file a-lock locked for version  1\.1
 ${PROG} [a-z]*: Pre-commit check failed
 ${PROG} \[[a-z]* aborted\]: correct above errors first!"
+	  # OK, now test "cvs admin -l" in the case where someone
+	  # else has the file locked.
+	  dotest_fail reserved-13c "${testcvs} admin -l a-lock" \
+"RCS file: ${TESTDIR}/cvsroot/first-dir/a-lock,v
+${PROG} \[[a-z]* aborted\]: Revision 1\.1 is already locked by fred"
 
 	  dotest reserved-14 "${testcvs} admin -u1.1 a-lock" \
 "RCS file: ${TESTDIR}/cvsroot/first-dir/a-lock,v
diff --git a/gnu/usr.bin/cvs/src/status.c b/gnu/usr.bin/cvs/src/status.c
index 98be085fb6c..541a969a711 100644
--- a/gnu/usr.bin/cvs/src/status.c
+++ b/gnu/usr.bin/cvs/src/status.c
@@ -31,7 +31,7 @@ static const char *const status_usage[] =
 };
 
 int
-status (argc, argv)
+cvsstatus (argc, argv)
     int argc;
     char **argv;
 {
diff --git a/gnu/usr.bin/cvs/src/version.c b/gnu/usr.bin/cvs/src/version.c
index f386895559b..d5fb085d078 100644
--- a/gnu/usr.bin/cvs/src/version.c
+++ b/gnu/usr.bin/cvs/src/version.c
@@ -12,7 +12,7 @@
 
 #include "cvs.h"
 
-char *version_string = "\nConcurrent Versions System (CVS) 1.9.26";
+char *version_string = "\nConcurrent Versions System (CVS) 1.9.28";
 
 #ifdef CLIENT_SUPPORT
 #ifdef SERVER_SUPPORT
diff --git a/gnu/usr.bin/cvs/src/wrapper.c b/gnu/usr.bin/cvs/src/wrapper.c
index 645ce5c1030..e7c540d63cf 100644
--- a/gnu/usr.bin/cvs/src/wrapper.c
+++ b/gnu/usr.bin/cvs/src/wrapper.c
@@ -395,6 +395,11 @@ wrap_add (line, isTemp)
 	*line='\0';
 	switch(opt){
 	case 'f':
+	    /* Before this is reenabled, need to address the problem in
+	       commit.c (see http://www.cyclic.com/cvs/dev-wrap.txt).  */
+	    error (1, 0,
+		   "-t/-f wrappers not supported by this version of CVS");
+
 	    if(e.fromcvsFilter)
 		free(e.fromcvsFilter);
 	    /* FIXME: error message should say where the bad value
@@ -404,6 +409,11 @@ wrap_add (line, isTemp)
 		error (1, 0, "Correct above errors first");
 	    break;
 	case 't':
+	    /* Before this is reenabled, need to address the problem in
+	       commit.c (see http://www.cyclic.com/cvs/dev-wrap.txt).  */
+	    error (1, 0,
+		   "-t/-f wrappers not supported by this version of CVS");
+
 	    if(e.tocvsFilter)
 		free(e.tocvsFilter);
 	    /* FIXME: error message should say where the bad value