$NetBSD: patch-ap,v 1.4 2013/10/14 06:51:02 adam Exp $

--- src/main.c.orig	2005-10-02 15:17:21.000000000 +0000
+++ src/main.c
@@ -41,6 +41,7 @@ int really_quiet = 0;
 int quiet = 0;
 int trace = 0;
 int noexec = 0;
+int nolock = 0;
 int readonlyfs = 0;
 int logoff = 0;
 
@@ -56,6 +57,7 @@ struct config *config;
 
 
 mode_t cvsumask = UMASK_DFLT;
+char *RCS_citag = NULL;
 
 char *CurDir;
 
@@ -284,6 +286,7 @@ static const char *const opt_usage[] =
     "    -r           Make checked-out files read-only.\n",
     "    -w           Make checked-out files read-write (default).\n",
     "    -n           Do not execute anything that will change the disk.\n",
+    "    -u           Don't create locks (implies -l).\n",
     "    -t           Show trace of program execution (repeat for more\n",
     "                 verbosity) -- try with -n.\n",
     "    -R           Assume repository is read-only, such as CDROM\n",
@@ -511,7 +514,7 @@ main (int argc, char **argv)
     int help = 0;		/* Has the user asked for help?  This
 				   lets us support the `cvs -H cmd'
 				   convention to give help for cmd. */
-    static const char short_options[] = "+QqrwtnRvb:T:e:d:Hfz:s:xa";
+    static const char short_options[] = "+QqrwtunRvb:T:e:d:Hfz:s:xa";
     static struct option long_options[] =
     {
         {"help", 0, NULL, 'H'},
@@ -667,6 +670,11 @@ main (int argc, char **argv)
 		break;
 	    case 'n':
 		noexec = 1;
+		nolock = 1;
+		logoff = 1;
+		break;
+	    case 'u':
+		nolock = 1;
 		logoff = 1;
 		break;
 	    case 'v':