Attachment 34101 Details for Bug 55526 – branches.diff

[patch] branches.diff

branches.diff (text/plain), 6.65 KB, created by Mathieu Arnold on 2003-08-13 09:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2003-08-13 09:20:09 UTC

Size: 6.65 KB

patch

obsolete

>Index: en_US.ISO8859-1/articles/releng/branches.ascii
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/releng/branches.ascii,v
>retrieving revision 1.2
>diff -u -b -w -u -r1.2 branches.ascii
>--- en_US.ISO8859-1/articles/releng/branches.ascii	3 Jul 2002 23:19:12 -0000	1.2
>+++ en_US.ISO8859-1/articles/releng/branches.ascii	13 Aug 2003 08:00:37 -0000
>@@ -17,14 +17,23 @@
>     |               |
>     + - - - - - - - +
>           |                                    RELENG_4 
>-     _____|_____   _ _ _   _ _ _ _   _ _ _   _ _ _   _ _ _    + - - - - - - +
>-    /           \ |     | |       | |     | |     | |     |   |             |
>-    |4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.X-STABLE  |
>-    \___________/ |_ _ _| |_ _ _ _| |_ _ _| |_ _ _| |_ _ _|   |             |
>-          |                                 ___|      |__     + - - - - - - +
>-          |                          _ _ _ | _ _ _   _ _ |_ _ _ __
>-          |                         |             | |             |
>-    + - - - - - - - +               | RELENG_4_3  | | RELENG_4_4  |
>-    |  5.0-CURRENT  |               |_ _ _ _ _ _ _| |_ _ _ _ _ _ _|
>+     _____|_____   ____   ______   ____   ____   ____   ____   ____   ____   ____    + - - - - - - +
>+    /           \ |    | |      | |    | |    | |    | |    | |    | |    | |    |   |             |
>+    |4.0-RELEASE|-|4.1R|-|4.1.1R|-|4.2R|-|4.3R|-|4.4R|-+4.5R+-+4.6R+-+4.7R+-+4.8R+---| 4.X-STABLE  |
>+    \___________/ |____| |______| |____| |____| |____| |____| |____| |____| |____|   |             |
>+          |                      __________| _____|     _|       |_     |__    |____ + - - - - - - +
>+          |               _ _ _ |_ _   _ _ _| _ _   _ _| _ _ _   _ |_ _    |_       |_____
>+     _____|_____         |          | |          | |          | |      |  _ _| _ _ _   _ _| _ _ _ 
>+    /           \        |RELENG_4_3| |RELENG_4_4| |RELENG_4_5| |4.6.2R| |          | |          |
>+    |5.0-RELEASE|------+ |_ _ _ _ _ | |_ _ _ _ _ | |_ _ _ _ _ | |_ _ _ | |RELENG_4_7| |RELENG_4_8|
>+    \__________ /   _ _| _ _ _                                   __|     |_ _ _ _ _ | |_ _ _ _ _ |
>+          |        |          |                              _ _| _ _ _ 
>+     _____|_____   |RELENG_5_0|    _ _ _ _ _                |          |
>+    /           \  |_ _ _ _ _ |   |          |              |RELENG_4_6|
>+    |5.1-RELEASE|-----------------|RELENG_5_1|              |_ _ _ _ _ |
>+    \__________ /                 |_ _ _ _ _ |
>+          |
>+    + - - - - - - - +
>+    |  5.1-CURRENT  |
>     |               |
>     + - - - - - - - +
>Index: share/images/articles/releng/branches.pic
>===================================================================
>RCS file: /home/ncvs/doc/share/images/articles/releng/branches.pic,v
>retrieving revision 1.1
>diff -u -b -w -u -r1.1 branches.pic
>--- share/images/articles/releng/branches.pic	11 Apr 2003 08:59:19 -0000	1.1
>+++ share/images/articles/releng/branches.pic	13 Aug 2003 08:00:37 -0000
>@@ -4,26 +4,17 @@
> .PS 6
> 
> HEAD_3:
>-	box width .9 "\s-23.0-CURRENT\s+2" dashed
>+	box width 1.4 "\s-23.0-CURRENT\s+2" dashed
> 
> 	line -> down from HEAD_3.s
> RELENG_3_0_0_RELEASE:
>-	box width .9 "\s-23.0-RELEASE\s+2"
>+	box width 1.3 "\s-23.0-RELEASE\s+2"
> 	move right 3
> 	"\s-2RELENG_3\s+2"
> 
> 	line -> down from RELENG_3_0_0_RELEASE.s
> RELENG_3_1_0_RELEASE:
>-	ellipse width .9 "\s-23.1-RELEASE\s+2"
>-	move left .75
>-	"\s-2H\s+2"
>-	move down .15
>-	"\s-2E\s+2"
>-	move down .15
>-	"\s-2A\s+2"
>-	move down .15
>-	"\s-2D\s+2"
>-
>+	ellipse width 1.4 "\s-23.1-RELEASE\s+2"
> 	line -> right from RELENG_3_1_0_RELEASE.e
> RELENG_3_2_0_RELEASE:
> 	box width .5 "\s-23.2R\s+2"
>@@ -46,17 +37,28 @@
> 
> 	line -> right from RELENG_3_5_1_RELEASE.e
> RELENG_3:
>-	box "\s-23-STABLE\s+2"
>+	box width 1.1 "\s-23-STABLE\s+2"
> 
> 	line -> down from RELENG_3_1_0_RELEASE.s
> HEAD_4:
>-	box width .9 "\s-24.0-CURRENT\s+2" dashed
>+	box width 1.4 "\s-24.0-CURRENT\s+2" dashed
>+
> 	move right 3
> 	"\s-2RELENG_4\s+2"
> 
>+	move left 3.75
>+	move down .15
>+	"\s-2H\s+2"
>+	move down .15
>+	"\s-2E\s+2"
>+	move down .15
>+	"\s-2A\s+2"
>+	move down .15
>+	"\s-2D\s+2"
>+
> 	line -> down from HEAD_4.s
> RELENG_4_0_0_RELEASE:
>-	ellipse width .9 "\s-24.0-RELEASE\s+2"
>+	ellipse width 1.4 "\s-24.0-RELEASE\s+2"
> 
> 	line -> right from RELENG_4_0_0_RELEASE.e
> RELENG_4_1_0_RELEASE:
>@@ -64,7 +66,7 @@
> 
> 	line -> right from RELENG_4_1_0_RELEASE.e
> RELENG_4_1_1_RELEASE:
>-	box width .5 "\s-24.1.1R\s+2"
>+	box width .6 "\s-24.1.1R\s+2"
> 
> 	line -> right from RELENG_4_1_1_RELEASE.e
> RELENG_4_2_0_RELEASE:
>@@ -76,7 +78,7 @@
> 
> 	line -> down from RELENG_4_3_0_RELEASE.s
> RELENG_4_3:
>-	box width .9 "\s-3RELENG_4_3\s+3" dashed
>+	box width .95 "\s-4RELENG_4_3\s+4" dashed
> 
> 	line -> right from RELENG_4_3_0_RELEASE.e
> RELENG_4_4_0_RELEASE:
>@@ -84,7 +86,7 @@
> 
> 	line -> down from RELENG_4_4_0_RELEASE.s
> RELENG_4_4:
>-	box width .9 "\s-3RELENG_4_4\s+3" dashed
>+	box width .95 "\s-4RELENG_4_4\s+4" dashed
> 
> 	line -> right from RELENG_4_4_0_RELEASE.e
> RELENG_4_5_0_RELEASE:
>@@ -92,7 +94,7 @@
> 
> 	line -> down from RELENG_4_5_0_RELEASE.s
> RELENG_4_5:
>-	box width .9 "\s-3RELENG_4_5\s+3" dashed
>+	box width .95 "\s-4RELENG_4_5\s+4" dashed
> 
> 	line -> right from RELENG_4_5_0_RELEASE.e
> RELENG_4_6_0_RELEASE:
>@@ -100,11 +102,11 @@
> 
> 	line -> down from RELENG_4_6_0_RELEASE.s
> RELENG_4_6_2_RELEASE:
>-	ellipse width .5 "\s-24.6.2R\s+2"
>+	ellipse width .6 "\s-24.6.2R\s+2"
> 	line -> down from RELENG_4_6_2_RELEASE.s
> 
> RELENG_4_6:
>-	box width .9 "\s-3RELENG_4_6\s+3" dashed
>+	box width .95 "\s-4RELENG_4_6\s+4" dashed
> 
> 	line -> right from RELENG_4_6_0_RELEASE.e
> 
>@@ -113,23 +115,39 @@
> 	line -> down from RELENG_4_7_0_RELEASE.s
> 
> RELENG_4_7:
>-	box width .9 "\s-3RELENG_4_7\s+3" dashed
>+	box width .95 "\s-4RELENG_4_7\s+4" dashed
> 	line -> right from RELENG_4_7_0_RELEASE.e
> 
>-RELENG_4:box "\s-24-STABLE\s+2"
>+RELENG_4_8_0_RELEASE:
>+	ellipse width .5 "\s-24.8R\s+2"
>+	line -> down from RELENG_4_8_0_RELEASE.s
>+
>+RELENG_4_8:
>+	box width .95 "\s-4RELENG_4_8\s+4" dashed
>+	line -> right from RELENG_4_8_0_RELEASE.e
>+
>+RELENG_4:box width 1.2 "\s-24-STABLE\s+2"
> 
> 	line -> down from RELENG_4_0_0_RELEASE.s
> 
> 
> RELENG_5_0_0_RELEASE:
>-	ellipse width .9 "\s-25.0-RELEASE\s+2"
>+	ellipse width 1.4 "\s-25.0-RELEASE\s+2"
> 	line -> right from RELENG_5_0_0_RELEASE.e
> 
> RELENG_5_0:
>-	box width .9 "\s-3RELENG_5_0\s+3" dashed
>+	box width 1.4 "\s-2RELENG_5_0\s+2" dashed
> 	line -> down from RELENG_5_0_0_RELEASE.s
> 
>+RELENG_5_1_0_RELEASE:
>+	ellipse width 1.4 "\s-25.1-RELEASE\s+2"
>+	line -> right from RELENG_5_1_0_RELEASE.e
>+
>+RELENG_5_1:
>+	box width 1.4 "\s-2RELENG_5_1\s+2" dashed
>+	line -> down from RELENG_5_1_0_RELEASE.s
>+
> HEAD_5:
>-	box width .9 "\s-25.0-CURRENT\s+2" dashed
>+	box width 1.4 "\s-25.1-CURRENT\s+2" dashed
> 
> .PE

Actions: View | Diff

Attachments on bug 55526: 34101