[Cvs-cvs] Changes to ccvs/src/server.c [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.40 ccvs/src/server.c:1.284.2.41
--- ccvs/src/server.c:1.284.2.40        Fri Sep  2 19:37:35 2005
+++ ccvs/src/server.c   Thu Sep 22 18:13:28 2005
@@ -1684,7 +1684,9 @@
             * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
             * this behavior.
             */
-           *timefield = '=';
+           if (*timefield != '+')
+               /* Skip this for entries with conflict markers.  */
+               *timefield = '=';
            break;
        }
     }
@@ -1755,7 +1757,10 @@
             * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
             * this behavior.
             */
-           *timefield = 'M';
+           if (*timefield != '+')
+               /* Skip this for entries with conflict markers.  */
+               *timefield = 'M';
+
            if (kopt != NULL)
            {
                if (alloc_pending (strlen (name) + 80))