From owner-freebsd-stable  Mon Jul  1 19:18:20 1996
Return-Path: owner-stable
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA11594
          for stable-outgoing; Mon, 1 Jul 1996 19:18:20 -0700 (PDT)
Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id TAA11583
          for <stable@freebsd.org>; Mon, 1 Jul 1996 19:18:08 -0700 (PDT)
Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id TAA00166; Mon, 1 Jul 1996 19:17:54 -0700
From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com>
Message-Id: <199607020217.TAA00166@GndRsh.aac.dev.com>
Subject: Re: Update 2.1-STABLE -> 2.1.5-RELEASE
To: nate@mt.sri.com (Nate Williams)
Date: Mon, 1 Jul 1996 19:17:54 -0700 (PDT)
Cc: nate@mt.sri.com, stable@freebsd.org
In-Reply-To: <199607012217.QAA12140@rocky.mt.sri.com> from Nate Williams at "Jul 1, 96 04:17:46 pm"
X-Mailer: ELM [version 2.4ME+ PL11 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-stable@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> > > As I understand it, there *IS* an upgrade path from 2.1R.  Jordan would
> > > know more.  However, the original poster asked for a CTM upgrade from
> > > 2.1-STABLE -> 2.1.5, and there isn't any '2.1-STABLE' release to upgrade
> > > from.  Also, creating a 'CTM' diff between 2.1R and 2.1.5 would be
> > > *HUGE*, probably bigger than downloading the entire release, so if you
> > > want the new sources you're more than welcome to download the entire new
> > > release and do a 'make world' and then hand-upgrade the /etc files by
> > > hand.  This is essentially what the 2.1R -> 2.1.5 'upgrade' would do
> > > anyway.
> > 
> > cvs rdiff -u -rRELENG_2_1_0_RELEASE -rRELENG_2_1_0 src
> > 
> > GndRsh:rgrimes {215} ls -lag BIG.diff
> > -rw-rw-r--  1 rgrimes  rgrimes  11171459 Jul  1 14:51 BIG.diff
> > 
> > GndRsh:rgrimes {218} df /usr/src
> > Filesystem  1K-blocks     Used    Avail Capacity  Mounted on
> > /dev/sd0g      158863   127050    19103    87%    /usr/src
> > 
> > 11MB vs ~127MB for a full src tree, both uncompressed, but compression
> > should still keep the same 10:1 relative size difference.
> 
> This assumes that the diff takes into account all of the changes that
> have been made.

It had damn well better take into account all of the changes, or cvs is
serously broken if it does not!

> Unfortunately, if you apply that diff to a virgin 2.1R
> tree you won't get the same tree as a 2.1.5 tree due to
> removal/additions and such. 
  ^No     ^Yes

All the additions are there, for example:
Index: src/eBones/README.PATCH
diff -u /dev/null src/eBones/README.PATCH:1.1.2.1
--- /dev/null   Mon Jul  1 14:24:27 1996
+++ src/eBones/README.PATCH     Thu May  2 10:04:50 1996
@@ -0,0 +1,52 @@
+IMPORTANT!
+

The removals could easily be handled by a list of files to rm, encapsulate
both the patch and the rm commands into a simple shell script.

Note that my file size above is bloated by far more than the rm commands
would add since I didn't run the cvs rdiff with the -q option so that it
has lots of these in it:

cvs rdiff: Diffing src/gnu/games/chess
cvs rdiff: Diffing src/gnu/games/chess/DOCUMENTATION
cvs rdiff: Diffing src/gnu/games/chess/Xchess

> The only *safe* way of doing this is to
> start with a 2.1R CD and build a set of patches from it.  Unionfs would
> be great for that. :)
> 
> 
> Nate


-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD