Changes between Version 50 and Version 51 of Be a CIVL developer

Timestamp:

02/24/17 10:43:05 (9 years ago)

Author:

siegel

Comment:

--

Be a CIVL developer

@@ -10 +10 @@
 1. To make any changes or additions to CIVL, you must first become a CIVL developer.   See above.
 1. Before embarking on any major changes or additions, talk to the other developers.  This is best done using the email list civl-dev@googlegroups.com.  Explain what you want to do, and listen to the feedback.
-1. Create a new branch for the new features you want to add into CIVL.  Name your branch anything you like and create it in the branches directory of the repository.
+1. Create a new branch for the new features you want to add into CIVL.  Name your branch anything you like and create it in the branches directory of the repository.  See "Using Subversion from the command line" for instructions on creating the branch.
+1. There are two different ways to work on your branch in Eclipse.   The first way is appropriate for relatively small changes that do not involve a lot of components.   In this approach you check out your branch into the current workspace, giving the project a different name from existing projects, e.g., `CIVL_mybranch`.   In the second approach, you create a whole new workspace with all four projects.  In this approach you can stick with the standard names for all projects (`CIVL`, `GMC`, `SARL`, `ABC`).   This approach is appropriate when you have bigger changes affecting multiple components.
 1. Proceed with development of your branch, committing as often as you like.  Periodically, merge changes from the trunk into your branch, and resolve any conflicts that result.  This will make it much easier to integrate your branch into the trunk later on.  Be sure to follow the CIVL  [wiki:"Coding Standards"] and the [wiki:"Coding Standards for CIVL models"].
 1. Create unit tests and system tests for your new code, making sure they provide 100% statement coverage of your code, at a minimum.  You may also need to make changes to existing tests.
@@ -61 +62 @@
 * To merge changes made to the trunk into your branch, change into your local branch directory and type
 {{{
-svn merge svn://vsl.cis.udel.edu/civl/trunk  .
+svn merge ^/trunk  .
 }}}
 Do this regularly (or whenever changes are committed to the trunk) in order to reduce the work of resolving conflicts when you decide to merge your branch back to the trunk.
 * Lead developers only: to merge a branch back to the trunk, change into the local branch directory and type
 {{{
-svn merge . svn://vsl.cis.udel.edu/civl/trunk
+svn merge . ^/trunk
 }}}
 Resolve conflicts as needed and make sure all tests pass.