On Tue, 23 May 2000, Andrew Brown wrote:

> >> I've sync'd with -current, and it is 1.4Y.  Since this is post-release of
> >> 1.4.2, is all of 1.4.2 in 1.4Y, or are there different code trees at this time?
> >
> >Please read:
> >
> >http://www.netbsd.org/Releases/release-map.html
> 
> that still doesn't answer the question of which is a subset of which.
> i always assumed that the release branch was a proper subset of the
> current branch (assuming of course that you don't want to try to mail
> jelly to a tree and call it a trunk).

Take a look at the diagram.  1.4 is a separate branch from
-current.  Essentially, when 1.4 is released, two separate branches are
created.  Bug fixes, perhaps some drivers, etc... are pulled from -current
into the 1.4 branch from time to time, but they are separate
branches.  When sufficient bug fixes or little features are added to 1.4,
it becomes 1.4.1 (then 1.4.2).  At that point, -current may be completely
different due to structure or archtecture changes.  So it would be proper
to say that the 1.4 branch contains all of -current _at the time the
source was branched_.  Past that, -current and 1.4 diverge; -current
remains the ever growing trunk of the tree, while 1.4 grows for a while,
then ends.

Ne pas?

-Jon
 --------------------------------------------------------------------
 "There is no fourth tower of Inverness!!!" -Meatball Fulton