Date: Tue, 8 Jul 1997 12:03:07 PDT From: Bill Fenner <fenner@parc.xerox.com> To: =?KOI8-R?B?4c7E0sXKIP7F0s7P1w==?= <ache@nagual.pp.ru> Cc: FreeBSD-current <current@freebsd.org>, Bruce Evans <bde@zeta.org.au>, cvsup-bugs@polstra.com Subject: Re: CVS Branches hits again! Message-ID: <97Jul8.120313pdt.177512@crevenia.parc.xerox.com> In-Reply-To: Your message of "Tue, 08 Jul 97 04:42:14 PDT." <Pine.BSF.3.96.970708153658.1488A-100000@nagual.pp.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
This is cvsup not being bug-compatible with cvs. These files
really were brought back from the dead, but cvs doesn't check
them out because it left them in the Attic.
The repository needs to be fixed; all of the files that are dead on the
vendor branch should be updated to be dead but not be on the vendor
branch. I know that futzing with the RCS files directly is considered
too dangerous to think about, but is probably the easiest way to handle
this case since cvs doesn't seem to want to. A sample RCS-file-munching is:
--- bdes.1,v.old Tue Jul 8 11:56:53 1997
+++ bdes.1,v Tue Jul 8 12:00:20 1997
@@ -1,5 +1,5 @@
-head 1.1;
-branch 1.1.1;
+head 1.2;
+branch;
access;
symbols
bsd_44_lite_2:1.1.1.3
@@ -15,6 +15,11 @@ branches
1.1.1.1;
next ;
+1.2
+date 97.07.09.00.00.00; author someone; state dead;
+branches;
+next 1.1;
+
1.1.1.1
date 94.05.27.12.30.50; author rgrimes; state Exp;
branches;
@@ -36,9 +41,9 @@ desc
-1.1
+1.2
log
-@Initial revision
+@Remove already-dead file
@
text
@.\" Copyright (c) 1991, 1993
@@ -346,6 +351,13 @@ This is inherent in the DES algorithm (s
.I "Advances in Cryptology \- Crypto '86 Proceedings" ,
Springer-Verlag New York, \(co1987, pp. 9-32.)
@
+
+1.1
+log
+@Initial revision
+@
+text
+@@
1.1.1.1
This is a trivial set of transforms that can be applied to any RCS
file which has no rev 1.2 and is dead on the vendor branch.
Bill
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?97Jul8.120313pdt.177512>