[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.8-253-g08c1640

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  08c16406a8e1a33169865f92e4d569f810ae1352 (commit)
      from  27310ccd8883b1331e668a289ab33df661688b47 (commit)

Summary of changes:
 docs/hacking.pod | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 08c16406a8e1a33169865f92e4d569f810ae1352
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 17 13:10:28 2012 -0500

    Document our policy for branches which straddle two versions

diff --git a/docs/hacking.pod b/docs/hacking.pod
index 396c562..7c50ee9 100644
--- a/docs/hacking.pod
+++ b/docs/hacking.pod
@@ -38,7 +38,9 @@ For example, a bugfix branched from C<4.0-trunk> might be named
 C<4.0/fail-taint-mode-early>.  A feature branched from C<master> when
 there exists a C<4.0-trunk> but no C<4.2-trunk> might be named
 C<4.2/rename-LogToScreen>.  For consistency, branches should use dashes,
-not underscores, to separate words.
+not underscores, to separate words.  Branches which are destined for
+4.2, but which are branched from 4.0 (to provide for easy extraction as
+a 4.0 extension) should be named 4.2-on-4.0/branch-name.
 
 Branches should be reviewed by another developer before being merged.
 Reviewers should make sure that the branch accomplishes what it claims

-----------------------------------------------------------------------