[Cvs-cvs] ccvs/src ChangeLog classify.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/08/27 01:08:29

Modified files:
        src            : ChangeLog classify.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3481&r2=1.3482
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3481
retrieving revision 1.3482
diff -u -b -r1.3481 -r1.3482
--- ChangeLog   24 Aug 2006 18:36:27 -0000      1.3481
+++ ChangeLog   27 Aug 2006 01:08:28 -0000      1.3482
@@ -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.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- classify.c  24 Apr 2006 18:50:25 -0000      1.38
+++ classify.c  27 Aug 2006 01:08:28 -0000      1.39
@@ -380,29 +380,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;
        }