From: Glen Stampoultzis Date: Tue, 23 Apr 2002 12:22:48 +0000 (+0000) Subject: Documentation updates X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a34f274aa3de9802270512d1cd1151e8983073b;p=poi.git Documentation updates git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_1_5_BRANCH@352470 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/documentation/xdocs/book.xml b/src/documentation/xdocs/book.xml index e5ab10098e..1d4b945e38 100644 --- a/src/documentation/xdocs/book.xml +++ b/src/documentation/xdocs/book.xml @@ -39,6 +39,7 @@ + diff --git a/src/documentation/xdocs/branching.xml b/src/documentation/xdocs/branching.xml new file mode 100644 index 0000000000..4246d83443 --- /dev/null +++ b/src/documentation/xdocs/branching.xml @@ -0,0 +1,97 @@ + + + + + +
+ Branching + + + +
+ + +
+

+ Branches are tagged in the following way: +

+
    +
  • REL_1_5_BRANCH
    • +
  • REL_2_0_BRANCH
    • +
+

+ Merge points should be tagged as follows: +

+
    +
  • REL_1_5_BRANCH_MERGE1
    • +
  • REL_1_5_BRANCH_MERGE2
    • +
  • etc...
    • +
+

+ Releases should be tagged as: +

+
    +
  • REL_1_5
    • +
  • REL_1_5_1
    • +
  • REL_1_5_2
    • +
  • etc...
    • +
+ +
+
+

+ Don't forget which branch you are currently on. This is critically + important. Committing stuff to the wrong branch causes all sorts of + headaches. Best to name your checkout after the branch you are on. +

+
+
+

+ All branching is currently managed by Glen Stampoultzis. If you wish + to create your own branch please let him know. Merging is also + handled by Glen. Just pop him a mail if you feel it's necessary to + create a branch or perform a merge. +

+

+ The reason to go through a single point for branching is that it can be + an easy thing to get wrong. Having a single person managing branches + means there is less chance of getting getting our wires crossed with this + difficult area of CVS. +

+
+
+

+ The following branches are currently active: +

+ + + + + + + + + + + + + +
+ Branch + + Description +
+ HEAD + + This is the trunk and is always active. Currently it is being used to continue development + of the 2.0 release. +
+ REL_1_5_BRANCH + + All bug fixes not specifically relevant to the 2.0 work should be placed in this branch. + From here they will merged back to the trunk and the merge point marked. +
+
+ + + \ No newline at end of file diff --git a/src/documentation/xdocs/historyandfuture.xml b/src/documentation/xdocs/historyandfuture.xml index 3855480f69..741f6aad5c 100755 --- a/src/documentation/xdocs/historyandfuture.xml +++ b/src/documentation/xdocs/historyandfuture.xml @@ -3,7 +3,7 @@
- + Project History