[Cvs-cvs] ccvs/src ChangeLog update.c [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     08/01/29 22:40:51

Modified files:
        src            : ChangeLog update.c 

Log message:
        * update.c (join_file): Remove trace that is no longer needed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.500&r2=1.2336.2.501
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.202.4.31&r2=1.202.4.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.500
retrieving revision 1.2336.2.501
diff -u -b -r1.2336.2.500 -r1.2336.2.501
--- ChangeLog   29 Jan 2008 20:34:34 -0000      1.2336.2.500
+++ ChangeLog   29 Jan 2008 22:40:50 -0000      1.2336.2.501
@@ -1,4 +1,8 @@
 2008-01-29  Derek R. Price  <address@hidden>
+
+       * update.c (join_file): Remove trace that is no longer needed.
+
+2008-01-29  Derek R. Price  <address@hidden>
            Paul Edwards  <address@hidden>
 
        * update.c (join_file): Detect deletion conflicts.

Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.202.4.31
retrieving revision 1.202.4.32
diff -u -b -r1.202.4.31 -r1.202.4.32
--- update.c    29 Jan 2008 20:34:37 -0000      1.202.4.31
+++ update.c    29 Jan 2008 22:40:51 -0000      1.202.4.32
@@ -2338,9 +2338,6 @@
                       finfo->fullname, locally, modmsg, jrev2);
 
            /* Register the conflict with the client.  */
-           if (trace)
-               fprintf (stderr, "%s-> join_file: ts=%s, conflict=%s\n",
-                        CLIENT_SERVER_STR, vers->ts_user, vers->ts_conflict);
 
            /* FIXME: vers->ts_user should always be set here but sometimes
             * isn't, namely when checkout_file() has just created the file,