[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog rcs.c
From: |
Larry Jones |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog rcs.c |
Date: |
Tue, 06 Mar 2007 03:31:10 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Larry Jones <scjones> 07/03/06 03:31:09
Modified files:
src : ChangeLog rcs.c
Log message:
merge changes from cvs1-11-x-branch
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3503&r2=1.3504
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.382&r2=1.383
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3503
retrieving revision 1.3504
diff -u -b -r1.3503 -r1.3504
--- ChangeLog 4 Mar 2007 00:27:56 -0000 1.3503
+++ ChangeLog 6 Mar 2007 03:31:09 -0000 1.3504
@@ -1,3 +1,8 @@
+2007-03-05 Larry Jones <address@hidden>
+
+ * rcs.c (RCS_delete_revs): When checking for tagged revisions,
+ include magic branch tags.
+
2007-03-01 Larry Jones <address@hidden>
* import.c (import_descend_dir): Correct error message.
Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -b -r1.382 -r1.383
--- rcs.c 7 Sep 2006 19:47:14 -0000 1.382
+++ rcs.c 6 Mar 2007 03:31:09 -0000 1.383
@@ -6612,6 +6612,22 @@
+/* Return a nonzero value if a magic tag rooted at ARG is found. */
+static int
+findmagictag (Node *node, void *arg)
+{
+ char *rev = (char *)arg;
+ size_t len = strlen (rev);
+
+ if (strncmp (node->data, rev, len) == 0 &&
+ strncmp (node->data + len, ".0.", 3) == 0)
+ return 1;
+ else
+ return 0;
+}
+
+
+
/* Delete revisions between REV1 and REV2. The changes between the two
revisions must be collapsed, and the result stored in the revision
immediately preceding the lower one. Return 0 for successful completion,
@@ -6866,8 +6882,9 @@
/* Doing this only for the :: syntax is for compatibility.
See cvs.texinfo for somewhat more discussion. */
- if (!inclusive
- && walklist (RCS_symbols (rcs), findtag, revp->version))
+ if (!inclusive &&
+ (walklist (RCS_symbols (rcs), findtag, revp->version) ||
+ walklist (RCS_symbols (rcs), findmagictag, revp->version)))
{
/* We don't print which file this happens to on the theory
that the caller will print the name of the file in a
- [Cvs-cvs] ccvs/src ChangeLog rcs.c,
Larry Jones <=