[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog NEWS src/ChangeLog src/sanity.sh...
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs ChangeLog NEWS src/ChangeLog src/sanity.sh... |
Date: |
Thu, 24 Aug 2006 18:36:27 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 06/08/24 18:36:27
Modified files:
. : ChangeLog NEWS
src : ChangeLog sanity.sh update.c
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1340&r2=1.1341
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.361&r2=1.362
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3480&r2=1.3481
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1164&r2=1.1165
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.265&r2=1.266
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -b -r1.1340 -r1.1341
--- ChangeLog 24 Aug 2006 01:24:12 -0000 1.1340
+++ ChangeLog 24 Aug 2006 18:36:27 -0000 1.1341
@@ -1,3 +1,8 @@
+2006-08-24 Derek Price <address@hidden>
+
+ [bug #17032]
+ * NEWS: Note patch w/Name keyword fix.
+
2006-08-23 Mark D. Baushke <address@hidden>
* Makefile.in, aclocal.m4, config.h.in, configure: Regenerated.
Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -b -r1.361 -r1.362
--- NEWS 29 Jun 2006 17:11:16 -0000 1.361
+++ NEWS 24 Aug 2006 18:36:27 -0000 1.362
@@ -23,6 +23,10 @@
BUG FIXES
+* Thanks to a report from Peter Toft <address@hidden>, CVS server now sends
+ correct patch files more often when the RCS `Name' keyword is present in
+ a working file (bug #17302).
+
* Thanks to a report from Dan Peterson <address@hidden>, clients now send the
right set of commands to the server when asked to update directories with
trailing slashes on their name.
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3480
retrieving revision 1.3481
diff -u -b -r1.3480 -r1.3481
--- src/ChangeLog 19 Aug 2006 16:33:35 -0000 1.3480
+++ src/ChangeLog 24 Aug 2006 18:36:27 -0000 1.3481
@@ -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-19 Mark D. Baushke <address@hidden>
* sanity.sh (close-stdout): An error from lib/closeout.c will
Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1164
retrieving revision 1.1165
diff -u -b -r1.1164 -r1.1165
--- src/sanity.sh 19 Aug 2006 16:33:35 -0000 1.1164
+++ src/sanity.sh 24 Aug 2006 18:36:27 -0000 1.1165
@@ -25441,10 +25441,11 @@
dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$'
- dotest keyword-23 "$testcvs update -A file1" "U file1" \
-"$CPROG update: checksum failure after patch to \`file1'; will refetch
-$CPROG client: refetching unpatchable files
-U file1"
+ # The update used to fail the first time with a checksum failure
+ # here, then the server would send the whole file. This was fixed
+ # in 1.11.23 & 1.12.14.
+ dotest keyword-23 "$testcvs update -A file1" "U file1"
+
dotest keyword-24 "cat file1" '\$'"Name: "'\$'"
change"
Index: src/update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- src/update.c 12 Jun 2006 16:01:32 -0000 1.265
+++ src/update.c 24 Aug 2006 18:36:27 -0000 1.266
@@ -1569,21 +1569,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, 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ChangeLog NEWS src/ChangeLog src/sanity.sh...,
Derek Robert Price <=