[Cvs-cvs] ccvs/src ChangeLog classify.c sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     08/09/12 15:34:48

Modified files:
        src            : ChangeLog classify.c sanity.sh 

Log message:
        [bug #17565] (Patch from Susanne Bertling <address@hidden>).
        * classify.c (Classify_File): Check for conflicts before keywords.
        * sanity.sh (branches-15): Update to compensate.
        (branches-15a, keyword2-11b, keyword2-12b): New tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.508&r2=1.2336.2.509
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.25.4.7&r2=1.25.4.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.219&r2=1.752.2.220

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.508
retrieving revision 1.2336.2.509
diff -u -b -r1.2336.2.508 -r1.2336.2.509
--- ChangeLog   12 Sep 2008 14:10:31 -0000      1.2336.2.508
+++ ChangeLog   12 Sep 2008 15:34:44 -0000      1.2336.2.509
@@ -1,5 +1,10 @@
 2008-09-12  Derek R. Price  <address@hidden>
 
+       [bug #17565] (Patch from Susanne Bertling <address@hidden>).
+       * classify.c (Classify_File): Check for conflicts before keywords.
+       * sanity.sh (branches-15): Update to compensate.
+       (branches-15a, keyword2-11b, keyword2-12b): New tests.
+
        * sanity.sh: Unset CDPATH during initialization.
        (Report from Paul Edwards <address@hidden>.)
 

Index: classify.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/classify.c,v
retrieving revision 1.25.4.7
retrieving revision 1.25.4.8
diff -u -b -r1.25.4.7 -r1.25.4.8
--- classify.c  9 May 2008 16:47:00 -0000       1.25.4.7
+++ classify.c  12 Sep 2008 15:34:45 -0000      1.25.4.8
@@ -339,10 +339,10 @@
                 * has changed.  If the sticky tag has changed, we just need
                 * to re-register the entry
                 */
-               if (keywords_may_change (aflag, vers))
-                   ret = T_PATCH;
-               else if (vers->ts_conflict)
+               if (vers->ts_conflict)
                    ret = T_CONFLICT;
+               else if (keywords_may_change (aflag, vers))
+                   ret = T_PATCH;
                else
                {
                    ret = T_UPTODATE;

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.219
retrieving revision 1.752.2.220
diff -u -b -r1.752.2.219 -r1.752.2.220
--- sanity.sh   12 Sep 2008 14:10:32 -0000      1.752.2.219
+++ sanity.sh   12 Sep 2008 15:34:45 -0000      1.752.2.220
@@ -6900,12 +6900,14 @@
 --- 1 ----
 ! 4:br1"
          dotest branches-15 \
-           "${testcvs} update -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
-           "RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+           "${testcvs} update -kk -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
+           "U file1
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
 retrieving revision 1\.1\.2\.1
 retrieving revision 1\.1\.2\.1\.2\.1
 Merging differences between 1\.1\.2\.1 and 1\.1\.2\.1\.2\.1 into file1
 rcsmerge: warning: conflicts during merge"
+         dotest_fail branches-15a "${testcvs} update -A file1" "C file1"
          dotest branches-16 "cat file1" '<<<<<<< file1
 1:ancest
 [=]======
@@ -23620,6 +23622,24 @@
 14a19
 > what else do we have${QUESTION}"
 
+         # The next two tests illustrate a different problem: conflicts
+         # prevent merge of keyword changes.
+         dotest_fail keyword2-11b "$testcvs -q update -kk file1" "C file1"
+         dotest_fail keyword2-12b "$testcvs diff file1" \
+"Index: file1
+===================================================================
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.2
+diff -r1\.2 file1
+0a1
+> <<<<<<< file1
+1a3,5
+> =======
+> \\\$""Revision: 1\.1\.2\.1 \\\$
+> >>>>>>> 1\.1\.2\.1
+14a19
+> what else do we have$QUESTION"
+
          # Here's the problem... shouldn't -kk a binary file...
          rm file1
          dotest keyword2-13 "${testcvs} -q update -A -kk -j branch" \