big commit
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -216,7 +216,6 @@ Now I go into a bit of a planning spree. #+BEGIN_SRC sh :tangle no :exports both :results output verbatim cd testmy echo "Scenes: - " >> plan.txt hg ci -m "we need scenes" @@ -234,7 +233,7 @@ Yes, I tend to do that… But we actually only need one change, so make it one by folding the last 4 changes changes into a single commit. Since fold does not take -m, yet, we will stop here for now. -#+BEGIN_SRC :tangle no :exports both :results output verbatim +#+BEGIN_SRC sh :tangle no :exports both :results output verbatim cd testmy # hg fold -r "-1:-4" # hg log -G @@ -245,6 +244,21 @@ cd .. /Do one big commit, then split it into two atomic commits./ +Now I apply the scenes to wishes, places and people. Which is not useful: First I should apply them to the wishes and check if all wishes are fullfilled. But while writing I forgot that, and anxious to show my co-gamemaster, I just did one big commit. + +#+BEGIN_SRC sh :exports both :results output verbatim +cd testmy +sed -i "s/The Judicator wants Action/The Judicator wants Action - Portals/" plan.txt +sed -i "s/The village/The village - lost appears, people wanish, portals during dreamtime/" plan.txt +hg ci -m "Apply Scenes to people and places." +hg log -G +cd .. +#+END_SRC + +Let’s fix that. + + + ** …as afterthought /Do one big commit, add an atomic commit. Then split the big commit./