[lmi-commits] [lmi] odd/width-of-inf 2589cea 1/6: Add digressionary-branch spells to the grimoire

[Greg Chicares]

branch: odd/width-of-inf
commit 2589cea438683de978d5d3271ce41af70cb2a8cf
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Add digressionary-branch spells to the grimoire
---
 gwc/develop1.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 3f4343b..bb95b37 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -66,6 +66,33 @@ git fetch xanadu
 
 git cherry-pick ..xanadu/name_of_pull_request
 
+  # Commit to a digressionary branch...
+
+  # See:
+  #   https://lists.nongnu.org/archive/html/lmi/2018-03/msg00082.html
+  # I use branch-name prefix 'odd/', e.g., 'odd/1e24-vs-1e24L'
+
+  # ...for pure divagations
+
+git branch odd/foo
+git checkout odd/foo
+git commit sandbox_test.cpp
+git checkout master
+git push origin odd/foo
+
+  # ...for failing unit tests that are to be...
+
+git branch odd/foo
+git checkout odd/foo
+git commit miscellany_test.cpp -m"Add a failing unit test"
+  # ...corrected later (see:
+  #   https://lists.nongnu.org/archive/html/lmi/2018-03/msg00084.html
+  # for a git-merge alternative)
+git checkout master
+git cherry-pick --no-commit ..odd/foo
+git commit miscellany.cpp miscellany_test.cpp -m"Enhance to pass new unit test"
+git push origin odd/foo
+
   # Discard local changes to particular files
 
 git checkout -- ce_skin_name.cpp ce_skin_name.hpp