4 Replies Latest reply on Feb 9, 2006 12:42 PM by dsicore

    Branch Policy Draft

      Here's a very rough draft of a branch policy for our https://svn.labs.jboss.com repository. I'm still working on it, but I'm recieving questions on overall branch policies with the import of the various new project code bases, so I thought I'd throw this out for review.

      This document will have examples of how to apply this branching policy using command line, Eclipse, and IntilleJ svn clients. For now, I've only the branch structures, policies, and nomenclature in this document until I get solid screenshots and instructions for each client.

      Please take a look and provide feeback. Specifically, we need to discuss how this branch policy affects the new Maven 2 build system and how we can streamline and automate the patch and service pack mechanisms.

      http://labs.jboss.com/wiki/BranchingPolicy

        • 1. Re: Branch Policy Draft
          starksm64

          I have read through the branching wiki and it makes sense, but its still very detached from how we currently operate with cvs and jbossas for example. I need to see how one branches from head to Branch_4_0, tags a release in the Branch_4_0 line to really get the trunk, branches, labels usage.

          The permissions described in the policy also seem a bit restricted to the project leads. For things like release creation, we need a notion similar to the sourceforge release technician as the project lead should not be the only one able to create a release.

          • 2. Re: Branch Policy Draft

            I'd like to understand a bit more what you mean by "detached from how we currently operate with cvs". If I give the examples of how to branch from trunk to Branch_4_0 and how to make a label, will that address the detached problem?

            With regards to the permissions, my plan was to indicate that the project leads determine who is responsible for their releases and what permissions any particular committer might have (i.e., what branches he/she is allowed to work on since we have the ability to restrict permissions down to the directory level in our repository). So, I'll add an additional role of Release Technician in the doc as well.

            • 3. Re: Branch Policy Draft
              starksm64

               

              "damon.sicore@jboss.com" wrote:
              I'd like to understand a bit more what you mean by "detached from how we currently operate with cvs". If I give the examples of how to branch from trunk to Branch_4_0 and how to make a label, will that address the detached problem?


              Yes, but also show how to create a Branch_4_0_3_SP1 sub-branch off of Branch_4_0 and a corresponding JBoss_4_0_3_SP1 label.


              • 4. Re: Branch Policy Draft

                 


                Yes, but also show how to create a Branch_4_0_3_SP1 sub-branch off of Branch_4_0 and a corresponding JBoss_4_0_3_SP1 label.


                OK. I think I'll just give a full branch policy for JBoss AS as the reference for the rest. This way people will understand the mechanics using the JBoss AS branch model.