a2ef7833f1
* The CVS client again correctly reports files with conflicts when using servers running CVS 1.11.20/1.12.12, or earlier (and maybe 3rd party servers). * The GSSAPI server should now build under HP-UX. * `cvs rtag' now correctly tags files that have been removed from the trunk. * Code efficiency has been improved slightly. * A rare race condition that could leave a lock on the val-tags file has been avoided. * A potential buffer overflow in the history command has been fixed. * Thanks to a report and patch from Garrett Rooney <grooney@collab.net>, paused trigger processes no longer cause the CVS server to consume 100% CPU. * Thanks to a suggestion from Joseph P. Skudlarek <Jskud@Jskud.com>, an :extssh: has been added as a synonym of the :ext: access method, as a kindness to users of old version of Eclipse. * Misc documentation updates and minor bug fixes.
49 lines
1.4 KiB
Text
49 lines
1.4 KiB
Text
$NetBSD: patch-ap,v 1.2 2008/01/04 06:48:06 martti Exp $
|
|
|
|
--- src/main.c.orig 2006-05-16 06:12:35.000000000 +0300
|
|
+++ src/main.c 2008-01-02 14:45:05.000000000 +0200
|
|
@@ -46,6 +46,7 @@
|
|
int quiet = 0;
|
|
int trace = 0;
|
|
int noexec = 0;
|
|
+int nolock = 0;
|
|
int logoff = 0;
|
|
|
|
/*
|
|
@@ -60,6 +61,7 @@
|
|
int top_level_admin = 0;
|
|
|
|
mode_t cvsumask = UMASK_DFLT;
|
|
+char *RCS_citag = NULL;
|
|
|
|
char *CurDir;
|
|
|
|
@@ -249,6 +251,7 @@
|
|
" -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 -- try with -n.\n",
|
|
" -v CVS version and copyright.\n",
|
|
" -T tmpdir Use 'tmpdir' for temporary files.\n",
|
|
@@ -407,7 +410,7 @@
|
|
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[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
|
|
+ static const char short_options[] = "+Qqrwtunvb:T:e:d:Hfz:s:xa";
|
|
static struct option long_options[] =
|
|
{
|
|
{"help", 0, NULL, 'H'},
|
|
@@ -531,6 +534,11 @@
|
|
break;
|
|
case 'n':
|
|
noexec = 1;
|
|
+ nolock = 1;
|
|
+ logoff = 1;
|
|
+ break;
|
|
+ case 'u':
|
|
+ nolock = 1;
|
|
logoff = 1;
|
|
break;
|
|
case 'v':
|