[Cvs-cvs] ccvs/src ChangeLog classify.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>     06/08/25 17:16:39

Modified files:
        src            : ChangeLog classify.c 

Log message:
        * classify.c (Classify_File): Remove hacks which worked around checksum
        failures from bug #17032.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.467&r2=1.2336.2.468
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.25.4.3&r2=1.25.4.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.467
retrieving revision 1.2336.2.468
diff -u -b -r1.2336.2.467 -r1.2336.2.468
--- ChangeLog   24 Aug 2006 17:33:24 -0000      1.2336.2.467
+++ ChangeLog   25 Aug 2006 17:16:38 -0000      1.2336.2.468
@@ -1,3 +1,8 @@
+2006-08-25  Derek Price  <address@hidden>
+
+       * classify.c (Classify_File): Remove hacks which worked around checksum
+       failures from bug #17032.
+
 2006-08-24  Derek Price  <address@hidden>
 
        [bug #17032]

Index: classify.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/classify.c,v
retrieving revision 1.25.4.3
retrieving revision 1.25.4.4
diff -u -b -r1.25.4.3 -r1.25.4.4
--- classify.c  22 Sep 2005 18:13:25 -0000      1.25.4.3
+++ classify.c  25 Aug 2006 17:16:39 -0000      1.25.4.4
@@ -366,29 +366,14 @@
                ret = T_CHECKOUT;
            }
            else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)
-           {
 
                /*
                 * The user file is still unmodified, so just get it as well
                 */
-               if (strcmp (vers->entdata->options ?
-                           vers->entdata->options : "", vers->options) != 0
-                   || (vers->srcfile != NULL
-                       && (vers->srcfile->flags & INATTIC) != 0))
-                   ret = T_CHECKOUT;
-               else
                    ret = T_PATCH;
-           }
            else if (No_Difference (finfo, vers))
                /* really modified, needs to merge */
                ret = T_NEEDS_MERGE;
-           else if ((strcmp (vers->entdata->options ?
-                             vers->entdata->options : "", vers->options)
-                     != 0)
-                    || (vers->srcfile != NULL
-                        && (vers->srcfile->flags & INATTIC) != 0))
-               /* not really modified, check it out */
-               ret = T_CHECKOUT;
            else
                ret = T_PATCH;
        }