[Cvs-cvs] ccvs/src ChangeLog sanity.sh update.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/08/24 17:33:26

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

Log message:
        [bug #17032]
        * update.c (patch_file): Correctly recreate client working files
        containing the RCS `Name' keyword before generating patches.
        * sanity.sh (keyword-23r): Merge with local case to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.466&r2=1.2336.2.467
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.202&r2=1.752.2.203
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.202.4.29&r2=1.202.4.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.466
retrieving revision 1.2336.2.467
diff -u -b -r1.2336.2.466 -r1.2336.2.467
--- ChangeLog   17 Aug 2006 18:07:29 -0000      1.2336.2.466
+++ ChangeLog   24 Aug 2006 17:33:24 -0000      1.2336.2.467
@@ -1,3 +1,10 @@
+2006-08-24  Derek Price  <address@hidden>
+
+       [bug #17032]
+       * update.c (patch_file): Correctly recreate client working files
+       containing the RCS `Name' keyword before generating patches.
+       * sanity.sh (keyword-23r): Merge with local case to compensate.
+
 2006-08-17  Larry Jones  <address@hidden>
 
        * hash.h: Rename structs node and list to hashnode and hashlist

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.202
retrieving revision 1.752.2.203
diff -u -b -r1.752.2.202 -r1.752.2.203
--- sanity.sh   29 Jun 2006 16:46:46 -0000      1.752.2.202
+++ sanity.sh   24 Aug 2006 17:33:25 -0000      1.752.2.203
@@ -22556,17 +22556,10 @@
 
          dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$'
 
-         if $remote; then
-           # Like serverpatch-8.  Not sure there is anything much we
-           # can or should do about this.
-           dotest keyword-23r "${testcvs} update -A file1" "P file1
-${PROG} update: checksum failure after patch to \./file1; will refetch
-${PROG} client: refetching unpatchable files
-${PROG} update: warning: file1 was lost
-U file1"
-         else
-           dotest keyword-23 "${testcvs} update -A file1" "[UP] file1"
-         fi
+         # The update used to fail the first time with a checksum failure
+         # here, then the server would send the whole failure.  This was fixed
+         # in 1.11.23.
+         dotest keyword-23 "$testcvs update -A file1" "U file1"
          dotest keyword-24 "cat file1" '\$'"Name:  "'\$'"
 change"
 

Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.202.4.29
retrieving revision 1.202.4.30
diff -u -b -r1.202.4.29 -r1.202.4.30
--- update.c    15 Apr 2006 18:33:19 -0000      1.202.4.29
+++ update.c    24 Aug 2006 17:33:26 -0000      1.202.4.30
@@ -1645,21 +1645,11 @@
     data.final_nl = 0;
     data.compute_checksum = 0;
 
-    /* FIXME - Passing vers_ts->tag here is wrong in the least number
-     * of cases.  Since we don't know whether vn_user was checked out
-     * using a tag, we pass vers_ts->tag, which, assuming the user did
-     * not specify a new TAG to -r, will be the branch we are on.
-     *
-     * The only thing it is used for is to substitute in for the Name
-     * RCS keyword, so in the error case, the patch fails to apply on
-     * the client end and we end up resending the whole file.
-     *
-     * At least, if we are keeping track of the tag vn_user came from,
-     * I don't know where yet. -DRP
+    /* Duplicating the client working file, so use the original sticky options.
      */
     retcode = RCS_checkout (vers_ts->srcfile, (char *) NULL,
-                           vers_ts->vn_user, vers_ts->tag,
-                           vers_ts->options, RUN_TTY,
+                           vers_ts->vn_user, vers_ts->entdata->tag,
+                           vers_ts->entdata->options, RUN_TTY,
                            patch_file_write, (void *) &data);
 
     if (fclose (e) < 0)