[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/add.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/add.c [signed-commits2] |
Date: |
Tue, 29 Nov 2005 18:44:21 -0500 |
Index: ccvs/src/add.c
diff -u ccvs/src/add.c:1.121.4.1 ccvs/src/add.c:1.121.4.2
--- ccvs/src/add.c:1.121.4.1 Fri Nov 18 20:02:07 2005
+++ ccvs/src/add.c Tue Nov 29 23:44:18 2005
@@ -500,7 +500,7 @@
finfo.fullname, prev);
status = base_checkout (vers->srcfile, &finfo,
NULL, prev, vers->tag,
- vers->options, true);
+ vers->options);
if (status != 0)
{
error (0, 0, "Failed to resurrect revision %s",
@@ -512,7 +512,7 @@
/* I don't actually set vers->ts_user here
* because it would confuse server_update ().
*/
- base_copy (&finfo, prev, "n");
+ base_copy (&finfo, prev, "nyd");
timestamp = time_stamp (finfo.file);
if (!really_quiet)
write_letter (&finfo, 'U');
@@ -547,7 +547,7 @@
*/
server_updated (&finfo, vers,
SERVER_UPDATED,
- (mode_t) -1, NULL, NULL, true);
+ (mode_t) -1, NULL, NULL);
/* This is kinda hacky or, at least, it renders the
* name "begin_added_files" obsolete, but we want
* the added_files to be counted without triggering
@@ -615,7 +615,7 @@
strlen (vers->vn_user));
status = base_checkout (vers->srcfile, &finfo,
vers->vn_user, vers->vn_user,
- vers->tag, vers->options, cvswrite);
+ vers->tag, vers->options);
if (status != 0)
{
error (0, 0, "Failed to resurrect revision %s.",
@@ -628,10 +628,11 @@
/* I don't actually set vers->ts_user here because it
* would confuse server_update().
*/
- base_copy (&finfo, vers->vn_user, "n");
- xchmod (finfo.file, cvswrite);
+ base_copy (&finfo, vers->vn_user,
+ cvswrite ? "ny" : "nn");
tmp = time_stamp (finfo.file);
- write_letter (&finfo, 'U');
+ if (!really_quiet)
+ write_letter (&finfo, 'U');
if (!quiet)
error (0, 0, "`%s', version %s, resurrected",
finfo.fullname, vers->vn_user);
@@ -648,7 +649,7 @@
*/
server_updated (&finfo, vers,
SERVER_UPDATED,
- (mode_t) -1, NULL, NULL, true);
+ (mode_t) -1, NULL, NULL);
}
/* We don't increment added_files here because this isn't
* a change that needs to be committed.