note: obsolete does not get pulled.
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -102,10 +102,18 @@ cd .. No my file contains the wishes of the players as well as the places. -Now we pull the changes into the repo of another game master with whom we plan this game. He adds the important people: +Now we pull the changes into the repo of another game master with whom we plan this game. #+BEGIN_SRC sh :exports both :results output verbatim hg -R testother pull -u testmy +hg log -G +#+END_SRC + +/note: the revisions numbers are different because the other repo only gets those obsolete revisions which are ancestors to non-obsolete revisions. That way evolve slowly cleans out obsolete revisions from the history without breaking repositories which already have them (but giving them a clear and easy path for evolution)./ + +He then adds the important people: + +#+BEGIN_SRC sh :exports both :results output verbatim cd testother echo "People: - The Lost @@ -185,7 +193,7 @@ echo "- People vanish" >> plan.txt hg ci -m "scene" echo "- Portals during dreamtime" >> plan.txt hg ci -m "scene" -hg log -G +hg log -G -r 9: cd .. #+END_SRC @@ -196,7 +204,7 @@ But we actually only need one change, so #+BEGIN_SRC sh :tangle no :exports both :results output verbatim cd testmy # hg fold -r "-1:-4" -# hg log -G +# hg log -G -r 9: cd .. #+END_SRC @@ -211,7 +219,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." -hg log -G +hg log -G -r 12: cd .. #+END_SRC @@ -225,7 +233,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" -hg log -G +hg log -G -r 12: cd .. #+END_SRC @@ -247,7 +255,7 @@ sed -i "s/====.*/\n/" plan.txt sed -i "s/>>>.*other//" plan.txt hg resolve -m hg commit -m "merge people" -hg log -G +hg log -G -r 12: cd .. #+END_SRC @@ -259,7 +267,7 @@ 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 +hg log -G -r 12: cat plan.txt cd .. #+END_SRC @@ -273,7 +281,7 @@ 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 +hg log -G -r 12: cat plan.txt cd .. #+END_SRC @@ -297,7 +305,7 @@ hg commit -m "Apply people to scenes" hg book splitchanges # and evolve to get rid of the obsoletes hg evolve --any -hg log -G +hg log -G -r 12: cd .. #+END_SRC @@ -309,7 +317,7 @@ You can see the additional commit sticki cd testmy hg up splitchanges hg graft -O tip -hg log -G +hg log -G -r 12: cd .. #+END_SRC