[Cvs-cvs] Changes to ccvs/src/checkin.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/checkin.c
diff -u ccvs/src/checkin.c:1.55.6.3 ccvs/src/checkin.c:1.55.6.4
--- ccvs/src/checkin.c:1.55.6.3 Wed Nov 23 01:46:53 2005
+++ ccvs/src/checkin.c  Tue Nov 29 23:44:18 2005
@@ -103,12 +103,12 @@
                /* The existing file is incorrect.  We need to check
                    out the correct file contents.  */
                if (base_checkout (finfo->rcs, finfo, pvers->vn_user,
-                                  vers->vn_rcs, NULL, options,
-                                 cvswrite
-                                 || fileattr_get (finfo->file, "_watched")))
+                                  vers->vn_rcs, NULL, options))
                    error (1, 0, "failed when checking out new copy of %s",
                           finfo->fullname);
-               base_copy (finfo, vers->vn_rcs, "y");
+               base_copy (finfo, vers->vn_rcs,
+                          cvswrite && !fileattr_get (finfo->file, "_watched")
+                          ? "yy" : "yn");
                set_time = 1;
            }
 
@@ -176,7 +176,7 @@
        if (set_time)
            /* Need to update the checked out file on the client side.  */
            server_updated (finfo, vers, SERVER_UPDATED,
-                           (mode_t) -1, NULL, NULL, true);
+                           (mode_t) -1, NULL, NULL);
        else
            server_checked_in (finfo->file, finfo->update_dir,
                               finfo->repository);