Changes between Version 5 and Version 6 of StartModMaint

Timestamp:

Dec 3, 2013, 3:50:16 PM (9 years ago)

Author:

Beman Dawes

Comment:

--

StartModMaint

@@ -14 +14 @@
  * A compiler and development environment installed and working smoothly.
  * Modular Boost installed as described in [wiki:TryModBoost Getting Started with Modular Boost].
- * {{{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. 
+ * {{{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.
+
+== Checking out the branch ==
+
+{{{
+cd modular-boost/libs/mylib
+git branch
+}}}
+
+Will tell you what branch your local repo working copy is on. To change to {{{develop}}} for a really simple bug fix do this:
+
+{{{
+cd modular-boost/libs/mylib
+git checkout develop
+}}}
+
+You 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.
+
+If there is any possibility the branch in the public upstream repo has changed, you also will want to:
+
+{{{
+git pull
+}}}
 
 == Verify Tests Working ==
@@ -21 +43 @@
 
 {{{
-cd modular-boost/libs/mylib
-git checkout develop
-git pull
 cd test
 b2
@@ -33 +52 @@
 
 {{{
-cd /modular-boost/libs/mylib
-git checkout develop
+cd modular-boost/libs/mylib
 # make edits
 # test as above
@@ -41 +59 @@
 }}}
 
-Simple bugs are usually fixed on the {{{develop}}} branch - there is usually no need to first create a bug-fix branch.
+== Start work on a new feature ==
 
+Simple 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.
+
+{{{
+... to be supplied ...
+}}}
+