Mercurial > hgbook
diff en/examples/tour @ 406:fb5c0d56d7f1
Fix test 'tour'.
Executing 'tour' test now creates some files in /tmp to store the
revision numbers as they are created on the fly and appear in the output
files. When SVG files are to be converted to PNG or EPS files within the
Makefile, a tool 'fixsvg' will be invoked to substitute some placeholder
markup by the real version number which fits to the test output, before
the final conversion takes place.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 22:15:35 +0200 |
parents | ef6a1427d0af |
children | c44d5854620b |
line wrap: on
line diff
--- a/en/examples/tour Wed Aug 20 22:08:24 2008 +0200 +++ b/en/examples/tour Wed Aug 20 22:15:35 2008 +0200 @@ -31,7 +31,7 @@ #$ name: log-r hg log -r 3 -hg log -r ff5d7b70a2a9 +hg log -r 0272e0d5a517 hg log -r 1 -r 4 #$ name: log.range @@ -73,6 +73,10 @@ hg commit +#$ name: merge.dummy1 + +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello + #$ name: tip hg tip -vp @@ -143,6 +147,10 @@ sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c hg commit -m 'A new hello for a new day.' +#$ name: merge.dummy2 + +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello + #$ name: merge.cat cat hello.c @@ -152,6 +160,10 @@ hg pull ../my-hello +#$ name: merge.dummy3 + +hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello + #$ name: merge.heads hg heads @@ -173,6 +185,10 @@ hg commit -m 'Merged changes' +#$ name: merge.dummy4 + +hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello + #$ name: merge.tip hg tip