Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 May 2004 12:03:50 +0900 (JST)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        colin.percival@wadham.ox.ac.uk
Cc:        cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/share/misc bsd-family-tree
Message-ID:  <20040528.120350.112804605.hrs@eos.ocn.ne.jp>
In-Reply-To: <6.1.0.6.1.20040528023341.03f51888@popserver.sfu.ca>
References:  <200405280012.i4S0CcRJ063336@repoman.freebsd.org> <6.1.0.6.1.20040528023341.03f51888@popserver.sfu.ca>

next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Fri_May_28_12_03_50_2004_383)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Fri_May_28_12_03_50_2004_733)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Fri_May_28_12_03_50_2004_733)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Colin Percival <colin.percival@wadham.ox.ac.uk> wrote
  in <6.1.0.6.1.20040528023341.03f51888@popserver.sfu.ca>:

colin.percival> At 01:12 28/05/2004, Hiroki Sato wrote:
colin.percival> >  Modified files:
colin.percival> >    share/misc           bsd-family-tree 
colin.percival> >  Log:
colin.percival> >  Add FreeBSD 4.10-RELEASE.
colin.percival> 
colin.percival>   Is there any reason why we can't have the 4.x and 5.x
colin.percival> releases included in the correct relative positions?  As
colin.percival> far as I'm aware, the rest of the file is sorted by date.

 I am not sure why, but it is reasonable to me.  I made and attached
 a patch to tidy up bsd-family-tree.  If there is no objection,
 I will commit this.

-- 
| Hiroki SATO

----Next_Part(Fri_May_28_12_03_50_2004_733)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="bsd-family-tree.diff"

Index: bsd-family-tree
===================================================================
RCS file: /home/ncvs/src/share/misc/bsd-family-tree,v
retrieving revision 1.81
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.81 bsd-family-tree
--- bsd-family-tree	28 May 2004 00:12:38 -0000	1.81
+++ bsd-family-tree	28 May 2004 02:59:48 -0000
@@ -74,115 +74,131 @@
    |             /   NetBSD 1.0 <-'            |          \  |
    |            /       |                      |           \ |
 FreeBSD 2.0 <--'        |                      |           BSD/OS 2.0
-   |                     \                     |             |
-FreeBSD 2.0.5             \                    |           BSD/OS 2.0.1
-   |                 .-----\------------- 4.4BSD Lite2       |
-   |                 |      \             |  |   |   |       |
-   |                 | .-----|------Rhapsody |   |   |       |
-   |                 | |     |        NetBSD 1.3 |   |       |
-   |                 | |     |           OpenBSD 2.3 |       |
-   |                 | |     |                BSD/OS 3.0     |
-FreeBSD 2.1          | |     |                               |
- |   |               | |  NetBSD 1.1 ------.               BSD/OS 2.1
- | FreeBSD 2.1.5     | |     |              \                |
- |     |             | |  NetBSD 1.2         \             BSD/OS 3.0
- | FreeBSD 2.1.6     | |     |  \          OpenBSD 2.0       |
- |     |             | |     |   \             |             |
- | FreeBSD 2.1.6.1   | |     |    \            |             |
- |     |             | |     |     \           |             |
- | FreeBSD 2.1.7     | |     |      |          |             |
- |     |             | |     |  NetBSD 1.2.1   |             |
- | FreeBSD 2.1.7.1   | |     |                 |             |
- |                   | |     |                 |             |
- |                   | |     |                 |             |
- *-FreeBSD 2.2       | |     |                 |             |
- |        \          | |     |                 |             |
- |     FreeBSD 2.2.1 | |     |                 |             |
- |         |         | |     |                 |             |
- |     FreeBSD 2.2.2 | |     |             OpenBSD 2.1       |
- |         |         | |     |                 |             |
- |     FreeBSD 2.2.5 | |     |                 |             |
- |         |         | |     |             OpenBSD 2.2       |
- |         |         | |  NetBSD 1.3           |             |
- |     FreeBSD 2.2.6 | |     |    |            |             |
- |         |         | |     | NetBSD 1.3.1    |           BSD/OS 3.1
- |         |         | |     |    |        OpenBSD 2.3       |
- |         |         | |     | NetBSD 1.3.2    |             |
- |     FreeBSD 2.2.7 | |     |    |            |             |
- |         |         | |     |    |            |           BSD/OS 4.0
- |         v         | |     |    |            |             |
- |     FreeBSD 2.2.8 | |     |    |            |             |
- |                   | |     |    |        OpenBSD 2.4       |
-FreeBSD 3.0 <--------* |     |    v            |             |
- |                     |     | NetBSD 1.3.3    |             |
- *---FreeBSD 3.1       |     |                 |             |
- |       |             |     |                 |           BSD/OS 4.0.1
- |   FreeBSD 3.2----*  |  NetBSD 1.4       OpenBSD 2.5       |
- |       |          |  |  |  |    |            |             |
- |       |          |  |  |  |    |            |             |
- |       |          |  |  |  |    |            |             |
- |   FreeBSD 3.3    |  |  |  | NetBSD 1.4.1    |             |
- |       |          |  |  |  |    |        OpenBSD 2.6       |
- |   FreeBSD 3.4    |  |  |  |    |            |             |
- |           |      |  |  |  |    |            |           BSD/OS 4.1
-FreeBSD 4.0  |      |  |  |  | NetBSD 1.4.2    |             |
- |           |      |  |  |  |    |            |             |
- |           |      |  |  |  |    |            |             |
- |   FreeBSD 3.5    |  |  |  |    |        OpenBSD 2.7       |
- |           |      |  |  |  |    |            |             |
- |   FreeBSD 3.5.1  |  |  |  |    |            |             |
- |                  |  |  |  |    |            |             |
- *---FreeBSD 4.1    |  |  |  |    |            |             |
- |      |           |  | (?) |    |            |             |
- |   FreeBSD 4.1.1  |  |  /  |    |            |             |
- |      |           |  | /   |    |            |             |
- |   FreeBSD 4.2   Darwin/   | NetBSD 1.4.3    |             |
- |      |         Mac OS X   |    |        OpenBSD 2.8     BSD/OS 4.2
- |      |             |      |    v            |             |
- |      |             |      |                 |             |
- |      |           10.0  NetBSD 1.5           |             |
- |   FreeBSD 4.3      |      |    |            |             |
- |      |             |      |    |        OpenBSD 2.9       |
- |      |             |      | NetBSD 1.5.1    |             |
- |      |             |      |    |            |             |
- |   FreeBSD 4.4-.    |      | NetBSD 1.5.2    |             |
- |      |        | Mac OS X  |    |            |             |
- |      |        |   10.1    |    |        OpenBSD 3.0       |
- |   FreeBSD 4.5 |    |      |    |            |             |
- |      |         \   |      |    |            |           BSD/OS 4.3
- |   FreeBSD 4.6   \  |      |    |        OpenBSD 3.1       |
- |      |           \ |      | NetBSD 1.5.3    |       	     |
- |   FreeBSD 4.6.2 Mac OS X  |    |            |             |
- |      |            10.2    |    v            |             |
- |   FreeBSD 4.7      |      |                 |             |
- |      |             |   NetBSD 1.6       OpenBSD 3.2       |
- |   FreeBSD 4.8      |      |    |            |             |
- |      |             |      | NetBSD 1.6.1    |             |
- |      |             |      |    |        OpenBSD 3.3     BSD/OS 5.0
- |      |             |      |    |            |             |
- |   FreeBSD 4.9      |      |    |        OpenBSD 3.4     BSD/OS 5.1 ISE
- |      |             |      |    |            |
- |      |             |      | NetBSD 1.6.2    |
- |      |             |      |    |            |
- |      |             |      |    |        OpenBSD 3.5
- |      |             |      |    v            |
- |   FreeBSD 4.10     |      |                 |
- |      |             |      |                 |
- |      v             |      |                 |
- |                    |      |                 |
-FreeBSD 5.0           |      |                 |
- |                    |      |                 |
-FreeBSD 5.1           |   NetBSD -current  OpenBSD -current
- |          \         |      |                 |
- |           ----- Mac OS X  |                 |
- |                   10.3    |                 |
-FreeBSD 5.2           |      |                 |
- |      |             |      |                 |
- |   FreeBSD 5.2.1    |      |                 |
- |                    |      |                 |
-FreeBSD 5 -current    |      |                 |
- |                    |      |                 |
- v                    v      v                 v
+   |                    |                      |             |
+FreeBSD 2.0.5           |                      |           BSD/OS 2.0.1
+   |                 .---\-------------- 4.4BSD Lite2        \
+   |                 |    \              |   |   |   \        \
+   |                 |     \            /    |   |    \        \
+   |                 | .----\---Rhapsody    /   /      \        \
+   |                 | |     \      .------'   /        \        \
+   |                 | |      \    /          /          \        \
+   |                 | |       \  /  .-------'            \        \
+FreeBSD 2.1          | |        \|  /                      \        \
+ |     |             | |         |-|- NetBSD 1.1 ------.    \        BSD/OS 2.1
+ | FreeBSD 2.1.5     | |         | |     |              \    \         |
+ |     |             | |         | |  NetBSD 1.2         \    ~----- BSD/OS 3.0
+ |     |             | |         | |     | \              \           |
+ | FreeBSD 2.1.6     | |         | |     |  \          OpenBSD 2.0    |
+ |     |             | |         | |     |   \             |          |
+ | FreeBSD 2.1.6.1   | |         | |     |    \            |          |
+ |     |             | |         | |     |     \           |          |
+ | FreeBSD 2.1.7     | |         | |     |      |          |          |
+ |     |             | |         | |     |  NetBSD 1.2.1   |          |
+ | FreeBSD 2.1.7.1   | |         | |     |                 |          |
+ |                   | |         | |     |                 |          |
+ |                   | |         | |     |                 |          |
+ *-FreeBSD 2.2       | |         | |     |                 |          |
+ |        \          | |         | |     |                 |          |
+ |     FreeBSD 2.2.1 | |         | |     |                 |          |
+ |         |         | |         |  \    |                 |          |
+ |     FreeBSD 2.2.2 | |          \  \   |             OpenBSD 2.1    |
+ |         |         | |           \  `------------.       |          |
+ |     FreeBSD 2.2.5 | |            \    |          \      |          |
+ |         |         | |             \   |           \ OpenBSD 2.2    |
+ |         |         | |              NetBSD 1.3      \    |          |
+ |     FreeBSD 2.2.6 | |                 |    |        \   |          |
+ |         |         | |                 | NetBSD 1.3.1 \  |        BSD/OS 3.1
+ |         |         | |                 |    |          \ |          |
+ |         |         | |                 |    |        OpenBSD 2.3    |
+ |         |         | |                 |    |            |          |
+ |         |         | |                 | NetBSD 1.3.2    |          |
+ |     FreeBSD 2.2.7 | |                 |    |            |          |
+ |         |         | |                 |    |            |        BSD/OS 4.0
+ |         |         | |                 |    |            |          |
+ |     FreeBSD 2.2.8 | |                 |    |            |          |
+ |                   | |                 |    |        OpenBSD 2.4    |
+FreeBSD 3.0 <--------* |                 |    |            |          |
+ |                     |                 | NetBSD 1.3.3    |          |
+ *---FreeBSD 3.1       |                 |                 |          |
+ |       |             |                 |                 |        BSD/OS 4.0.1
+ |   FreeBSD 3.2----*  |              NetBSD 1.4       OpenBSD 2.5    |
+ |       |          |  |              |  |    |            |          |
+ |       |          |  |              |  |    |            |          |
+ |       |          |  |              |  |    |            |          |
+ |   FreeBSD 3.3    |  |              |  | NetBSD 1.4.1    |          |
+ |       |          |  |              |  |    |            |          |
+ |       |          |  |              |  |    |        OpenBSD 2.6    |
+ |   FreeBSD 3.4    |  |              |  |    |            |          |
+ |           |      |  |              |  |    |            |        BSD/OS 4.1
+FreeBSD 4.0  |       \  \             |  | NetBSD 1.4.2    |          |
+ |           |        \  \            |  |    |            |          |
+ |           |         \  \           |  |    |            |          |
+ |   FreeBSD 3.5        \  \          |  |    |        OpenBSD 2.7    |
+ |           |           \  \         |  |    |            |          |
+ |   FreeBSD 3.5.1        \  \        |  |    |            |          |
+ |                         \  \       |  |    |            |          |
+ *------------- FreeBSD 4.1 \  \    (?)  |    |            |          |
+ |                  |        \  \   /    |    |            |          |
+ |              FreeBSD 4.1.1 \  \ /     |    |            |          |
+ |                  |          `--*      |    |            |          |
+ |              FreeBSD 4.2       |      | NetBSD 1.4.3    |          |
+ |                  |             |      |    |            |        BSD/OS 4.2
+ |                  |             |      |    |        OpenBSD 2.8    |
+ |                  |             |      |    v            |          |
+ |                  |             |      |                 |          |
+ |                  |             |   NetBSD 1.5           |          |
+ |                  |             |      |    |            |          |
+ |                  |           Darwin   |    |            |          |
+ |                  |          Mac OS X  |    |            |          |
+ |                  |            10.0    |    |            |          |
+ |              FreeBSD 4.3       |      |    |            |          |
+ |                  |             |      |    |        OpenBSD 2.9    |
+ |                  |             |      | NetBSD 1.5.1    |          |
+ |                  |             |      |    |            |          |
+ |                  |             |      | NetBSD 1.5.2    |          |
+ |                  |             |      |    |            |          |
+ |              FreeBSD 4.4-.     |      |    |            |          |
+ |                  |        \ Mac OS X  |    |            |          |
+ |                  |         \  10.1    |    |        OpenBSD 3.0    |
+ |              FreeBSD 4.5    |  |      |    |            |          |
+ |                  |          |  |      |    |            |        BSD/OS 4.3
+ |                  |          |  |      |    |        OpenBSD 3.1    |
+ |              FreeBSD 4.6    |  |      |    |            |          |
+ |                  |          |  |      | NetBSD 1.5.3    |          |
+ |              FreeBSD 4.6.2  |  |      |    |            |          |
+ |                  |         Mac OS X   |    |            |          |
+ |                  |            10.2    |    v            |          |
+ |                  |             |      |                 |          |
+ |                  |             |   NetBSD 1.6           |          |
+ |              FreeBSD 4.7       |      |    |            |          |
+ |                  |             |      |    |        OpenBSD 3.2    |
+FreeBSD 5.0         |             |      |    |            |          |
+ |              FreeBSD 4.8       |      |    |            |          |
+ |                  |             |      | NetBSD 1.6.1    |          |
+ |                  |             |      |    |            |          |
+ |                  |             |      |    |        OpenBSD 3.3    |
+ |                  |             |      |    |            |        BSD/OS 5.0
+FreeBSD 5.1 -----------------.    |      |    |            |          |
+ |                  |         \   |      |    |            |          |
+ |                  |          Mac OS X  |    |            |          |
+ |                  |           10.3     |    |            |          |
+ |              FreeBSD 4.9       |      |    |            |          |
+ |                  |             |      |    |            |      BSD/OS 5.1 ISE
+ |                  |             |      |    |            |
+ |                  |             |      |    |        OpenBSD 3.4
+FreeBSD 5.2         |             |      |    |            |
+ |      |           |             |      |    |            |
+ |  FreeBSD 5.2.1   |             |      |    |            |
+ |                  |             |      | NetBSD 1.6.2    |
+ |                  |             |      |    |            |
+ |                  |             |      |    |        OpenBSD 3.5
+ |                  |             |      |    v            |
+ |              FreeBSD 4.10      |      |                 |
+ |                  |             |      |                 |
+ |                  v             |      |                 |
+FreeBSD 5 -current                |   NetBSD -current  OpenBSD -current
+ |                                |      |                 |
+ v                                v      v                 v
 
 Time
 ----------------

----Next_Part(Fri_May_28_12_03_50_2004_733)----

----Security_Multipart0(Fri_May_28_12_03_50_2004_383)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQBAtqwWTyzT2CeTzy0RArTLAKCEZvc0OUD5NNtZHnJilUKgoKdtXwCeMLy+
nVOwOQG86FsWgEgl13XciCI=
=++tp
-----END PGP SIGNATURE-----

----Security_Multipart0(Fri_May_28_12_03_50_2004_383)----



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040528.120350.112804605.hrs>