ES-Escape:svn organization

From Xtreemos

(Difference between revisions)
Jump to: navigation, search
(New page: == Organization of the svn repository == We do not want all developers to hack the same version of the code simultaneously. Otherwise, a bug in somebody's code may prevent any other deve...)
Current revision (08:32, 28 September 2009) (edit) (undo)
 
Line 16: Line 16:
**Inform other developers of the change using the mailing-list. This is especially important if you commit changes that may affect others (e.g., you changed the format of a config file).
**Inform other developers of the change using the mailing-list. This is especially important if you commit changes that may affect others (e.g., you changed the format of a config file).
**Merge the branch into the trunk
**Merge the branch into the trunk
-
* For more information about svn you can read this very good [http://svnbook.red-bean.com/en/1.2/ svn tutorial]. Also take a look at [[WS-Escape::svn howto|this summary]] specially written for the WS-escape project.
+
* For more information about svn you can read this very good [http://svnbook.red-bean.com/en/1.2/ svn tutorial]. Also take a look at [[WS-Escape:svn howto|this summary]] specially written for the WS-escape project.

Current revision

Organization of the svn repository

We do not want all developers to hack the same version of the code simultaneously. Otherwise, a bug in somebody's code may prevent any other developper to work on his/her own part. We will instead create multiple branches for the different subprojects. An svn branch is a full copy of the main repository, but it can evolve independently from the others. After a number of changes have been made, we can merge updates from one branch into the main trunk.

  • The trunk should contain only code that has been tested and that is believed to be stable. Of course, people may write bugs in there, but they should be fixed as fast as possible, since they may prevent others to do their own work.
  • Different sub-projects will have a sub-branch for experimental code:
    • Platform (for Leo's platform updates)
    • Packaging (for Niek's packaging updates)
    • Provisioning (for Obaid's resource provisioning)
    • Load-balancer (for Alexandra's load balancer)
    • Demo (for Priyanka's demo application, client and GUI)
  • Whenever some piece of code works well in a branch, please use the following procedure to merge updates into the trunk:
    • Import the latest trunk updates into the branch
    • Test again
    • Inform other developers of the change using the mailing-list. This is especially important if you commit changes that may affect others (e.g., you changed the format of a config file).
    • Merge the branch into the trunk
  • For more information about svn you can read this very good svn tutorial. Also take a look at this summary specially written for the WS-escape project.
Personal tools