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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/08 20:20:13

Modified files:
        src            : ChangeLog client.c sanity.sh server.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3438&r2=1.3439
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.453&r2=1.454
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1145&r2=1.1146
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.464&r2=1.465

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3438
retrieving revision 1.3439
diff -u -b -r1.3438 -r1.3439
--- ChangeLog   7 Jun 2006 18:50:11 -0000       1.3438
+++ ChangeLog   8 Jun 2006 20:20:13 -0000       1.3439
@@ -1,3 +1,12 @@
+2006-06-08  Derek Price  <address@hidden>
+
+       * server.c (requests): Add "Empty-conflicts" marker.
+       * client.c (send_fileproc): Send contents of all files with conflicts
+       unless the server can handle the conflict marker in the Entry.
+
+       * sanity.sh (conflicts4): New tests.
+       (Original patch from Mark D. Baushke <address@hidden>.)
+
 2006-06-07  Derek Price  <address@hidden>
 
        * sign.c: #include <limits.h> for ULONG_MAX.

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -b -r1.453 -r1.454
--- client.c    7 Jun 2006 18:41:29 -0000       1.453
+++ client.c    8 Jun 2006 20:20:13 -0000       1.454
@@ -5547,6 +5547,7 @@
     else if (!vers->ts_rcs || args->force)
        may_be_modified = true;
     else if (strcmp (vers->ts_conflict
+                    && supported_request ("Empty-conflicts")
                     ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
             || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
     {

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1145
retrieving revision 1.1146
diff -u -b -r1.1145 -r1.1146
--- sanity.sh   26 May 2006 19:34:02 -0000      1.1145
+++ sanity.sh   8 Jun 2006 20:20:13 -0000       1.1146
@@ -1981,7 +1981,7 @@
        tests="${tests} join join2 join3 join4 join5 join6 join7"
        tests="${tests} join-readonly-conflict join-admin join-admin-2"
        tests="${tests} join-rm"
-       tests="${tests} new newb conflicts conflicts2 conflicts3"
+       tests="${tests} new newb conflicts conflicts2 conflicts3 conflicts4"
        tests="${tests} clean"
        tests="${tests} keywordexpand"
        # Checking out various places (modules, checkout -d, &c)
@@ -12289,6 +12289,46 @@
 
 
 
+       conflicts4)
+         mkdir 1; cd 1
+         dotest conflicts4-1 "$testcvs -q co -l ."
+         mkdir first-dir
+         dotest conflicts4-2 "$testcvs add first-dir" \
+"Directory $CVSROOT_DIRNAME/first-dir added to the repository"
+         cd ..
+         mkdir 2; cd 2
+         dotest conflicts4-3 "$testcvs -q co -l first-dir" ''
+         cd ../1/first-dir
+         echo baseline >file1
+         dotest conflicts4-4 "$testcvs -q add file1" \
+"$SPROG add: use .$SPROG commit. to add this file permanently"
+         dotest conflicts4-5 "$testcvs -q ci -m add-it" \
+"$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+initial revision: 1\.1"
+         cd ../../2/first-dir
+         dotest conflicts4-6 "$testcvs -q update" "U file1"
+         # Make a local change
+         echo wibble2 >> file1
+         dotest conflicts4-7 "$testcvs -q ci -m update2" \
+"$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+new revision: 1\.2; previous revision: 1\.1"
+         cd ../../1/first-dir
+         echo wibble1 >>file1
+         dotest conflicts4-8 "$testcvs -q update" \
+"Merging differences between 1\.1 and 1\.2 into \`file1'
+$CPROG update: conflicts during merge
+C file1"
+         dotest_fail conflicts4-9 "$testcvs -q update" \
+"C file1"
+         
+         dokeep
+         cd ../..
+         rm -rf 1 2
+         modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
+         ;;
+
+
+
        clean)
          # Test update -C (overwrite local mods w/ repository copies)
          mkdir 1; cd 1

Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -b -r1.464 -r1.465
--- server.c    26 May 2006 19:25:57 -0000      1.464
+++ server.c    8 Jun 2006 20:20:13 -0000       1.465
@@ -6154,6 +6154,7 @@
   REQ_LINE("Signature", serve_signature, 0),
   REQ_LINE("Base-diff", serve_noop, 0),
   REQ_LINE("Is-modified", serve_is_modified, 0),
+  REQ_LINE("Empty-conflicts", serve_noop, 0),
 
   /* The client must send this request to interoperate with CVS 1.5
      through 1.9 servers.  The server must support it (although it can