summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/cvs/cmd.c5
-rw-r--r--usr.bin/cvs/entries.c5
-rw-r--r--usr.bin/cvs/rcs.c14
3 files changed, 14 insertions, 10 deletions
diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index fe73fc3b94d..d891dd43593 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.36 2005/10/07 21:47:32 reyk Exp $ */
+/* $OpenBSD: cmd.c,v 1.37 2005/10/22 17:23:21 joris Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -178,12 +178,13 @@ cvs_startcmd(struct cvs_cmd *cmd, int argc, char **argv)
* We are not checking for CVS/Root since we fetched the root
* above via cvsroot_get().
*
- * checkout, export, import and release do not depend on these files.
+ * checkout, export, import, init and release do not depend on these files.
*/
error = 0;
if ((cmd->cmd_op != CVS_OP_CHECKOUT) &&
(cmd->cmd_op != CVS_OP_EXPORT) &&
(cmd->cmd_op != CVS_OP_IMPORT) &&
+ (cmd->cmd_op != CVS_OP_INIT) &&
(cmd->cmd_op != CVS_OP_RELEASE) &&
(cmd->cmd_op != CVS_OP_VERSION)) {
/* check for the CVS directory */
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c
index 8966fc26b1e..7c959c0ecea 100644
--- a/usr.bin/cvs/entries.c
+++ b/usr.bin/cvs/entries.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: entries.c,v 1.49 2005/09/06 17:08:05 xsa Exp $ */
+/* $OpenBSD: entries.c,v 1.50 2005/10/22 17:23:21 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -392,7 +392,8 @@ cvs_ent_parse(const char *entry)
if (!strcmp(fields[3], "up to date"))
ent->ce_status = CVS_ENT_UPTODATE;
} else {
- if (strcmp(fields[3], CVS_DATE_DUMMY) == 0)
+ if ((strcmp(fields[3], CVS_DATE_DUMMY) == 0) ||
+ (strncmp(fields[3], "Initial ", 8) == 0))
ent->ce_mtime = CVS_DATE_DMSEC;
else
ent->ce_mtime = cvs_date_parse(fields[3]);
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 63e9f78c4b4..b9c6d59c078 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.92 2005/10/18 01:08:13 joris Exp $ */
+/* $OpenBSD: rcs.c,v 1.93 2005/10/22 17:23:21 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -1457,11 +1457,13 @@ rcs_rev_add(RCSFILE *rf, RCSNUM *rev, const char *msg, time_t date,
return (-1);
}
- ordp = NULL;
- rcsnum_cpy(rev, old, 0);
- while (ordp == NULL) {
- old = rcsnum_dec(old);
- ordp = rcs_findrev(rf, old);
+ if (!(rf->rf_flags & RCS_CREATE)) {
+ ordp = NULL;
+ rcsnum_cpy(rev, old, 0);
+ while (ordp == NULL) {
+ old = rcsnum_dec(old);
+ ordp = rcs_findrev(rf, old);
+ }
}
}