[Cvs-cvs] Changes to ccvs/src/classify.c

[Derek Robert Price]

Index: ccvs/src/classify.c
diff -u ccvs/src/classify.c:1.34 ccvs/src/classify.c:1.35
--- ccvs/src/classify.c:1.34    Thu Mar 17 17:15:19 2005
+++ ccvs/src/classify.c Thu Sep 22 05:43:46 2005
@@ -236,19 +236,8 @@
                           finfo->fullname);
                ret = T_REMOVE_ENTRY;
            }
-           else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)
-           {
-
-               /*
-                * The user file is still unmodified, so just remove it from
-                * the entry list
-                */
-               if (!really_quiet)
-                   error (0, 0, "`%s' is no longer in the repository",
-                          finfo->fullname);
-               ret = T_REMOVE_ENTRY;
-           }
-           else if (No_Difference (finfo, vers))
+           else if (strcmp (vers->ts_user, vers->ts_rcs)
+                    && No_Difference (finfo, vers))
            {
                /* they are different -> conflict */
                if (!really_quiet)
@@ -260,10 +249,13 @@
            }
            else
            {
-               /* they weren't really different */
+
+               /*
+                * The user file is still unmodified, so just remove it from
+                * the entry list
+                */
                if (!really_quiet)
-                   error (0, 0,
-                          "warning: `%s' is not (any longer) pertinent",
+                   error (0, 0, "`%s' is no longer in the repository",
                           finfo->fullname);
                ret = T_REMOVE_ENTRY;
            }