fix export.
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -12,7 +12,7 @@ Currently I rework my code extensively b :noweb: yes :END: -#+BEGIN_SRC sh :shebang #!/bin/sh +#+BEGIN_SRC sh :shebang #!/bin/sh :exports both :results output verbatim # Tests for refactoring history with the evolve extension #+END_SRC @@ -22,7 +22,7 @@ Currently I rework my code extensively b We have one public repo and 2 nonpublishing repos. -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim # Initialize the test repo hg init testpublic # a public repo hg init testmy # my repo @@ -42,7 +42,7 @@ done /Prepare the content of the repos/ -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim cd testmy echo "Hello World" > hello.txt hg ci -Am "Hello World" @@ -50,11 +50,20 @@ hg log -G cd .. #+END_SRC +#+RESULTS: +| Füge | hello.txt | hinzu | | | | | +| @ | Änderung: | 0:6f9dbac57286 | | | | | +| Marke: | tip | | | | | | +| Nutzer: | my | | | | | | +| Datum: | Wed | Jan | 9 | 19:51:12 | 2013 | +0100 | +| Zusammenfassung: | Hello | World | | | | | +| | | | | | | | + ** Amend /Add a bad change and amend it./ -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim cd testmy sed -i s/World/Evoluton/ hello.txt hg ci -m "Hello Evolution" @@ -67,6 +76,33 @@ hg log -G cd .. #+END_SRC +#+RESULTS: +| @ | Änderung: | 1:b59dc2fddce4 | | | | | | | +| | | Marke: | tip | | | | | | +| | | Nutzer: | my | | | | | | +| | | Datum: | Wed | Jan | 9 | 19:51:18 | 2013 | +0100 | +| | | Zusammenfassung: | Hello | Evolution | | | | | +| | | | | | | | | | +| o | Änderung: | 0:6f9dbac57286 | | | | | | | +| Nutzer: | my | | | | | | | | +| Datum: | Wed | Jan | 9 | 19:51:12 | 2013 | +0100 | | | +| Zusammenfassung: | Hello | World | | | | | | | +| | | | | | | | | | +| Hello | Evoluton | | | | | | | | +| FIX | this | up | | | | | | | +| @ | Änderung: | 3:84523157dd67 | | | | | | | +| | | Marke: | tip | | | | | | +| | | Vorgänger: | 0:6f9dbac57286 | | | | | | +| | | Nutzer: | my | | | | | | +| | | Datum: | Wed | Jan | 9 | 19:51:18 | 2013 | +0100 | +| | | Zusammenfassung: | Hello | Evolution | | | | | +| | | | | | | | | | +| o | Änderung: | 0:6f9dbac57286 | | | | | | | +| Nutzer: | my | | | | | | | | +| Datum: | Wed | Jan | 9 | 19:51:12 | 2013 | +0100 | | | +| Zusammenfassung: | Hello | World | | | | | | | +| | | | | | | | | | + ** …together /Add a bad change. Followed by a good change. Pull both into another repo and amend it. Do a good change in the other repo. Then amend the bad change in the original repo, pull it into the other and evolve./ @@ -77,7 +113,7 @@ Now we change the format to planning a r First I do my own change. -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim cd testmy # Now we add the bad change echo "Wishes: @@ -105,7 +141,7 @@ No my file contains the wishes of the pl Now we pull the changes into the repo of another game master with whom we plan this game. He adds the important people: -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim hg -R testother pull -u testmy cd testother echo "People: @@ -123,7 +159,7 @@ cd .. And I realize too late, that my estimate of the wishes of the players was wrong. So I simply amend it. -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim cd testmy hg up -r -2 sed -i "s/The Solek wants Action/The Solek wants emotionally intense situations/" plan.txt @@ -136,7 +172,7 @@ Now I amended my commit, but my history Changeset evolution allows us to evolve our repository to get rid of dependencies on obsolete changes. -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim cd testmy hg evolve hg log -G @@ -149,14 +185,14 @@ Now I have nice looking history without But I rewrote history. What happens if my collegue pulls this? -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim hg -R testother pull testmy hg -R testother log -G #+END_SRC As you can see, he is told that his changes became unstable, since they depend on obsolete history. No need to panic: He can just evolve his repo to be state of the art again. -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim hg -R testother evolve #+END_SRC @@ -164,7 +200,7 @@ But the unstable change is the current w /note: that message might be a candidate for cleanup./ -#+BEGIN_SRC sh +#+BEGIN_SRC sh :exports both :results output verbatim hg -R testother evolve --any hg -R testother log -G #+END_SRC @@ -177,7 +213,7 @@ And as you can see, everything looks nic Now I go into a bit of a planning spree. -#+BEGIN_SRC sh :tangle no +#+BEGIN_SRC sh :tangle no :exports both :results output verbatim cd testmy echo "Scenes: @@ -198,10 +234,10 @@ 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 +#+BEGIN_SRC :tangle no :exports both :results output verbatim cd testmy -hg fold -r "-1:-4" -hg log -G +# hg fold -r "-1:-4" +# hg log -G cd .. #+END_SRC