Changes between Version 15 and Version 16 of Be a CIVL developer


Ignore:
Timestamp:
01/10/17 14:03:15 (9 years ago)
Author:
siegel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Be a CIVL developer

    v15 v16  
    2222== Using Subversion ==
    2323
    24 (Ziqing, please clarify and fill in details below...)
    25 
    2624* CIVL uses Subversion to manage source code. The CIVL Subversion repository is structured in the typical way.  In particular, the repository contains directories named `trunk`, `branches` and `tags`.
    27 * To create a new branch from the trunk of a specific revision r to branches: `svn copy  svn://vsl.cis.udel.edu/civl/trunk@r   svn://vsl.cis.udel.edu/civl/branches/branch_name`.
    28 * Once a new branch created, you can check out your new branch with the command: `svn co svn://vsl.cis.udel.edu/civl/branches/branch_name`.
    29 * Within your own branch, you can do any changes you want for your new feature and you can commit your changes to the svn server so that your won't lose your work.
    30 * To keep being updated with the latest trunk, go to your local branch directory, type:  `svn merge  svn://vsl.cis.udel.edu/civl/trunk  .`.
    31 * Frequent update can help you reducing the work of resolving conflicts when you decide to merge your branch back to trunk finally.
    32 * To merge your branch back to the trunk, go to your local branch directory, type: `svn merge .  svn://vsl.cis.udel.edu/civl/trunk`.
    33 * When you decide to merge your branch back to trunk, be sure you have resolved all conflicts against the trunk and all regression tests passed. Then one of the lead developer of CIVL will help you committing into the trunk after reviewing your work.
     25* To create a new branch named `branch_name` from the current trunk, type
     26{{{
     27svn copy svn://vsl.cis.udel.edu/civl/trunk svn://vsl.cis.udel.edu/civl/branches/branch_name
     28}}}
     29* Once a new branch has been created, you can check out your new branch with the command
     30{{{
     31svn co svn://vsl.cis.udel.edu/civl/branches/branch_name
     32}}}
     33You can also create a new Eclipse project from that branch, in the usual way.
     34* Within your own branch, you can change anything you want to implement your changes or additions, and you can commit your changes to the svn server so that you won't lose your work.
     35* To merge changes made to the trunk into your branch, change into your local branch directory and type
     36{{{
     37svn merge svn://vsl.cis.udel.edu/civl/trunk  .
     38}}}
     39Do 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.
     40* Lead developers only: to merge a branch back to the trunk, change into the local branch directory and type
     41{{{
     42svn merge . svn://vsl.cis.udel.edu/civl/trunk
     43}}}
     44Resolve conflicts as needed and make sure all tests pass.