[Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh server.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/06/08 19:58:32

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

Log message:
        * 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>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.456&r2=1.2336.2.457
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.318.4.41&r2=1.318.4.42
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.197&r2=1.752.2.198
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.284.2.50&r2=1.284.2.51

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.456
retrieving revision 1.2336.2.457
diff -u -b -r1.2336.2.456 -r1.2336.2.457
--- ChangeLog   7 Jun 2006 06:56:04 -0000       1.2336.2.456
+++ ChangeLog   8 Jun 2006 19:58:29 -0000       1.2336.2.457
@@ -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  Mark D. Baushke  <address@hidden>
 
        * modules.c (my_module): Remove unused variable xvalue.

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.41
retrieving revision 1.318.4.42
diff -u -b -r1.318.4.41 -r1.318.4.42
--- client.c    31 May 2006 15:15:56 -0000      1.318.4.41
+++ client.c    8 Jun 2006 19:58:30 -0000       1.318.4.42
@@ -5148,6 +5148,7 @@
     else if (vers->ts_rcs == NULL
             || args->force
             || 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.752.2.197
retrieving revision 1.752.2.198
diff -u -b -r1.752.2.197 -r1.752.2.198
--- sanity.sh   24 May 2006 17:07:20 -0000      1.752.2.197
+++ sanity.sh   8 Jun 2006 19:58:30 -0000       1.752.2.198
@@ -1115,7 +1115,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"
        # Checking out various places (modules, checkout -d, &c)
        tests="${tests} modules modules2 modules3 modules4 modules5 modules6"
@@ -11330,6 +11330,57 @@
          rm -rf ${CVSROOT_DIRNAME}/first-dir
          ;;
 
+       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" \
+"$PROG add: use .$PROG commit. to add this file permanently"
+         dotest conflicts4-5 "${testcvs} -q ci -m add-it" \
+"RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+done
+Checking in file1;
+$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+initial revision: 1\.1
+done"
+         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" \
+"Checking in file1;
+$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+new revision: 1\.2; previous revision: 1\.1
+done"
+         cd ../../1/first-dir
+         echo wibble1 >>file1
+         dotest conflicts4-8 "${testcvs} -Q update" \
+"RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+retrieving revision 1\.2
+Merging differences between 1\.1 and 1\.2 into file1
+rcsmerge: warning: conflicts during merge
+cvs update: conflicts found in file1"
+         dotest_fail conflicts4-9 "${testcvs} -q update" \
+"C file1"
+         
+         if $keep; then
+           echo Keeping $TESTDIR and exiting due to --keep
+            exit 0
+         fi
+
+         cd ../..
+         rm -rf 1 2
+         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.284.2.50
retrieving revision 1.284.2.51
diff -u -b -r1.284.2.50 -r1.284.2.51
--- server.c    26 May 2006 16:25:25 -0000      1.284.2.50
+++ server.c    8 Jun 2006 19:58:32 -0000       1.284.2.51
@@ -4863,6 +4863,7 @@
   REQ_LINE("Checkin-time", serve_checkin_time, 0),
   REQ_LINE("Modified", serve_modified, RQ_ESSENTIAL),
   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