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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/12 15:43:13

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

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3573&r2=1.3574
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1199&r2=1.1200

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3573
retrieving revision 1.3574
diff -u -b -r1.3573 -r1.3574
--- ChangeLog   12 Sep 2008 14:34:46 -0000      1.3573
+++ ChangeLog   12 Sep 2008 15:43:11 -0000      1.3574
@@ -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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- classify.c  12 Sep 2008 14:34:47 -0000      1.42
+++ classify.c  12 Sep 2008 15:43:12 -0000      1.43
@@ -350,10 +350,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.1199
retrieving revision 1.1200
diff -u -b -r1.1199 -r1.1200
--- sanity.sh   12 Sep 2008 14:34:47 -0000      1.1199
+++ sanity.sh   12 Sep 2008 15:43:12 -0000      1.1200
@@ -7958,10 +7958,12 @@
 --- 1 ----
 ! 4:br1"
          dotest branches-15 \
-           "$testcvs update -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
-"Merging differences between 1\.1\.2\.1 and 1\.1\.2\.1\.2\.1 into \`file1'
+"$testcvs update -kk -j 1.1.2.1 -j 1.1.2.1.2.1 file1" \
+"U file1
+Merging differences between 1\.1\.2\.1 and 1\.1\.2\.1\.2\.1 into \`file1'
 $CPROG update: conflicts during merge
 C file1"
+         dotest_fail branches-15a "$testcvs update -A file1" "C file1"
          dotest branches-16 "cat file1" '<<<<<<< file1
 1:ancest
 [=]======
@@ -26995,6 +26997,20 @@
 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" \
+"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" \