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

[Derek Robert Price]

Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.318.4.28 ccvs/src/client.c:1.318.4.29
--- ccvs/src/client.c:1.318.4.28        Fri May 27 16:25:10 2005
+++ ccvs/src/client.c   Thu Sep 22 18:13:25 2005
@@ -5198,7 +5198,9 @@
     }
     else if (vers->ts_rcs == NULL
             || args->force
-            || strcmp (vers->ts_user, vers->ts_rcs) != 0)
+            || strcmp (vers->ts_conflict
+                       ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
+            || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
     {
        if (args->no_contents
            && supported_request ("Is-modified"))