[Myfaces Wiki] Update of "TrinidadCreating12Branches" by JWaldman

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Myfaces Wiki" for change notification.

The following page has been changed by JWaldman:
http://wiki.apache.org/myfaces/TrinidadCreating12Branches

The comment on the change is:
added the best way to create 1.2.X and pre-1.2.(X+1) branches 

------------------------------------------------------------------------------
  
  == 9. RE-TEST, etc. ==
  
+ == 10. INFORMATION ON BRANCHES ==
+ 
+ The 1.2.x branches should be created and fixes checked into them like this:
+ 
+  * once 1.2.3 is released, we copy 1.2.3-branch to pre-1.2.4-branch.
+  * pre-1.2.4:  1.2-only fixes, and 1.2 versions of 1.0.4 fixes, all to make the "release 1.2.4" process easier.  If created, use this as the merge source for making 1.2.4.
+  * 1.2.3:  fixes of any sort that are needed for RCF on top of 1.2.3.  Never used as a merge source for 1.2.4.
+ 
+ 
+ And the checkin rules are:
+  1. Fixes generally go ONLY into trunk
+  2. If fixes are 1.2 only, they go into the current pre-1.2.X-branch
+  3. If fixes are substantially different for 1.2, they go into the current pre-1.2.X-branch
+  4. If fixes of any sort are urgently needed on top of the current release, it can go into the 1.2.X-branch 
+