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

[Derek Robert Price]

Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.452.2.10 ccvs/src/server.c:1.452.2.11
--- ccvs/src/server.c:1.452.2.10        Fri Dec  2 21:12:45 2005
+++ ccvs/src/server.c   Fri Dec  2 23:50:49 2005
@@ -5233,6 +5233,9 @@
      */
     assert (!(filebuf && file_gzip_level));
 
+    TRACE (TRACE_FUNCTION, "server_updated (%s, %s, %s)",
+          finfo->fullname, vers->vn_rcs, vers->options);
+
     if (noexec)
     {
        /* Hmm, maybe if we did the same thing for entries_file, we
@@ -8173,6 +8176,10 @@
            (  (!poptions || !poptions[0]) && (!options || !options[0]))
               /* ...or the option specs match.  */
            || (poptions && options && !strcmp (poptions, options)))
+       && (   /* ...both option specs are empty...  */
+           (  (!ptag || !ptag[0]) && (!tag || !tag[0]))
+              /* ...or the option specs match.  */
+           || (ptag && tag && !strcmp (ptag, tag)))
        )
        /* PREV & REV are the same, so the client should already have this
         * file.
@@ -8184,7 +8191,7 @@
                          *(finfo->update_dir) ? finfo->update_dir : ".",
                          basefile);
 
-    if (prev && strcmp (prev, "0") && strcmp (prev, rev))
+    if (prev && strcmp (prev, "0"))
     {
        /* Compute and send diff.  */
        int dargc = 0;
@@ -8196,6 +8203,17 @@
        pbasefile = cvs_temp_name ();
        status = RCS_checkout (rcs, pbasefile, prev, ptag, poptions,
                               NULL, NULL, NULL);
+
+       if (trace)
+       {
+           char *tmp = Xasprintf ("cat %s >/tmp/basefile", basefile);
+           system (tmp);
+           free (tmp);
+           tmp = Xasprintf ("cat %s >/tmp/pbasefile", pbasefile);
+           system (tmp);
+           free (tmp);
+       }
+
        if (status)
            error (1, 0, "Failed to checkout revision %s of `%s'",
                   prev, finfo->file);