Changes between Version 5 and Version 6 of StartModMaint


Ignore:
Timestamp:
Dec 3, 2013, 3:50:16 PM (5 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • StartModMaint

    v5 v6  
    1414 * A compiler and development environment installed and working smoothly.
    1515 * Modular Boost installed as described in [wiki:TryModBoost Getting Started with Modular Boost].
    16  * {{{b2}}} in your path. That allows most of the command line examples given here to work as shown on both Windows and POSIX-like systems.
     16 * {{{b2}}} in your path. That allows most of the command line examples given here to work as shown on both Windows and POSIX-like systems.
     17
     18== Checking out the branch ==
     19
     20{{{
     21cd modular-boost/libs/mylib
     22git branch
     23}}}
     24
     25Will tell you what branch your local repo working copy is on. To change to {{{develop}}} for a really simple bug fix do this:
     26
     27{{{
     28cd modular-boost/libs/mylib
     29git checkout develop
     30}}}
     31
     32You only have to do that once; your local repo working copy will sit on that branch until it is explicitly changed by a command you give.
     33
     34If there is any possibility the branch in the public upstream repo has changed, you also will want to:
     35
     36{{{
     37git pull
     38}}}
    1739
    1840== Verify Tests Working ==
     
    2143
    2244{{{
    23 cd modular-boost/libs/mylib
    24 git checkout develop
    25 git pull
    2645cd test
    2746b2
     
    3352
    3453{{{
    35 cd /modular-boost/libs/mylib
    36 git checkout develop
     54cd modular-boost/libs/mylib
    3755# make edits
    3856# test as above
     
    4159}}}
    4260
    43 Simple bugs are usually fixed on the {{{develop}}} branch - there is usually no need to first create a bug-fix branch.
     61== Start work on a new feature ==
    4462
     63Simple bugs are usually fixed on the {{{develop}}} branch, at least in smaller projects. There is usually no need to first create a bug-fix branch. But git developers usually create a (possibly private) branch to work on new features, since development of new features on the development branch might leave it unstable for longer that expected.
     64
     65{{{
     66... to be supplied ...
     67}}}
     68