Added reference to myself, emacs and org-mode.
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -179,7 +179,7 @@ But the unstable change is the current w #+BEGIN_SRC sh :exports both :results output verbatim :session test-hg-evolve hg -R testother evolve --any -hg -R testother log -G +hg -R testother log -G -r 1: #+END_SRC And as you can see, everything looks nice again. @@ -201,6 +201,7 @@ echo "- People vanish" >> plan.txt hg ci -m "scene" echo "- Portals during dreamtime" >> plan.txt hg ci -m "scene" +echo hg log -G -r 9: cd .. #+END_SRC @@ -227,6 +228,7 @@ cd testmy sed -i "s/The Judicator wants Action/The Judicator wants Action - portals/" plan.txt sed -i "s/The village/The village - lost, vanish, portals/" plan.txt hg ci -m "Apply Scenes to people and places." +echo hg log -G -r 12: cd .. #+END_SRC @@ -241,6 +243,7 @@ sed -i "s/The village - lost, vanish, po hg amend -m "Apply scenes to wishes" sed -i "s/The village/The village - lost, vanish, portals/" plan.txt hg commit -m "Apply scenes to places" +echo hg log -G -r 12: cd .. #+END_SRC @@ -263,6 +266,7 @@ sed -i "s/====.*/\n/" plan.txt sed -i "s/>>>.*other//" plan.txt hg resolve -m hg commit -m "merge people" +echo hg log -G -r 12: cd .. #+END_SRC @@ -275,7 +279,8 @@ sed -i "s/The Solek wants emotionally in sed -i "s/Lost appears/Lost appears | Lost/" plan.txt sed -i "s/People vanish/People vanish | Specter/" plan.txt hg commit -m "apply people to wishes, places and scenes" -hg log -G -r 12: +echo +hg log -G -r 19: cat plan.txt cd .. #+END_SRC @@ -289,7 +294,8 @@ cd testmy sed -i "s/- The Specter/- The Specter\n- Wild Memories/" plan.txt sed -i "s/- Portals during dreamtime/- Portals during dreamtime\n- Unconnected Memories/" plan.txt hg ci -m "Added wild memories to fullfill the wish for action" -hg log -G -r 12: +echo +hg log -G -r 19: cat plan.txt cd .. #+END_SRC @@ -312,8 +318,9 @@ hg commit -m "Apply people to scenes" # let’s mark this for later use hg book splitchanges # and evolve to get rid of the obsoletes +echo hg evolve --any -hg log -G -r 12: +hg log -G -r 19: cd .. #+END_SRC @@ -325,7 +332,7 @@ You can see the additional commit sticki cd testmy hg up splitchanges hg graft -O tip -hg log -G -r 12: +hg log -G -r 19: cd .. #+END_SRC @@ -338,3 +345,5 @@ That’s it. All that’s left is fixing Evolve does a pretty good job at making it convenient and safe to rework history. If you’re an early adopter, I can advise testing it yourself. Otherwise, it might be better to wait until more early adopters tested it and polished its rough edges. /note: hg amend was subsumed into hg commit --amend, so the dedicated command will likely disappear./ + +/note: This guide was created by [[http://draketo.de][Arne Babenhauserheide]] with [[http://gnu.org/software/emacs][emacs]] [[http://orgmode.org][org-mode]]./