hgbook
changeset 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
line diff
1.1 --- a/.hgignore Tue Mar 06 21:43:30 2007 -0800 1.2 +++ b/.hgignore Tue Mar 06 21:44:56 2007 -0800 1.3 @@ -19,7 +19,7 @@ 1.4 *.lg 1.5 *.lo[fgt] 1.6 *.orig 1.7 -*.out 1.8 +*/pdf/*.out 1.9 *.pdf 1.10 *.png 1.11 *.ps
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/en/examples/backout.init.out Tue Mar 06 21:44:56 2007 -0800 2.3 @@ -0,0 +1,7 @@ 2.4 +$ \textbf{hg init myrepo} 2.5 +$ \textbf{cd myrepo} 2.6 +$ \textbf{echo first change >> myfile} 2.7 +$ \textbf{hg add myfile} 2.8 +$ \textbf{hg commit -m 'first change'} 2.9 +$ \textbf{echo second change >> myfile} 2.10 +$ \textbf{hg commit -m 'second change'}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/en/examples/backout.manual.backout.out Tue Mar 06 21:44:56 2007 -0800 3.3 @@ -0,0 +1,7 @@ 3.4 +$ \textbf{echo third change >> myfile} 3.5 +$ \textbf{hg commit -m 'third change'} 3.6 +$ \textbf{hg backout -m 'back out second change' 1} 3.7 +reverting myfile 3.8 +changeset backs out changeset 3.9 +the backout changeset is a new head - do not forget to merge 3.10 +(use "backout --merge" if you want to auto-merge)
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/en/examples/backout.manual.cat.out Tue Mar 06 21:44:56 2007 -0800 4.3 @@ -0,0 +1,2 @@ 4.4 +$ \textbf{cat myfile} 4.5 +first change
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/en/examples/backout.manual.clone.out Tue Mar 06 21:44:56 2007 -0800 5.3 @@ -0,0 +1,9 @@ 5.4 +$ \textbf{cd ..} 5.5 +$ \textbf{hg clone -r1 myrepo newrepo} 5.6 +requesting all changes 5.7 +adding changesets 5.8 +adding manifests 5.9 +adding file changes 5.10 +added 2 changesets with 2 changes to 1 files 5.11 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 5.12 +$ \textbf{cd newrepo}
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/en/examples/backout.manual.heads.out Tue Mar 06 21:44:56 2007 -0800 6.3 @@ -0,0 +1,13 @@ 6.4 +$ \textbf{hg heads} 6.5 +changeset: 6.6 +tag: tip 6.7 +parent: 6.8 +user: Bryan O'Sullivan <bos@serpentine.com> 6.9 + 6.10 +summary: back out second change 6.11 + 6.12 +changeset: 6.13 +user: Bryan O'Sullivan <bos@serpentine.com> 6.14 + 6.15 +summary: third change 6.16 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/en/examples/backout.manual.log.out Tue Mar 06 21:44:56 2007 -0800 7.3 @@ -0,0 +1,13 @@ 7.4 +$ \textbf{hg log --style compact} 7.5 +3[tip]:1 7.6 + back out second change 7.7 + 7.8 +2 7.9 + third change 7.10 + 7.11 +1 7.12 + second change 7.13 + 7.14 +0 7.15 + first change 7.16 +
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/en/examples/backout.manual.merge.out Tue Mar 06 21:44:56 2007 -0800 8.3 @@ -0,0 +1,7 @@ 8.4 +$ \textbf{hg merge} 8.5 +merging myfile 8.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 8.7 +(branch merge, don't forget to commit) 8.8 +$ \textbf{hg commit -m 'merged backout with previous tip'} 8.9 +$ \textbf{cat myfile} 8.10 +third change
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/en/examples/backout.manual.parents.out Tue Mar 06 21:44:56 2007 -0800 9.3 @@ -0,0 +1,8 @@ 9.4 +$ \textbf{hg parents} 9.5 +changeset: 9.6 +tag: tip 9.7 +parent: 9.8 +user: Bryan O'Sullivan <bos@serpentine.com> 9.9 + 9.10 +summary: back out second change 9.11 +
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/en/examples/backout.non-tip.backout.out Tue Mar 06 21:44:56 2007 -0800 10.3 @@ -0,0 +1,9 @@ 10.4 +$ \textbf{echo third change >> myfile} 10.5 +$ \textbf{hg commit -m 'third change'} 10.6 +$ \textbf{hg backout --merge -m 'back out second change' 1} 10.7 +reverting myfile 10.8 +changeset backs out changeset 10.9 +merging with changeset 10.10 +merging myfile 10.11 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 10.12 +(branch merge, don't forget to commit)
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/en/examples/backout.non-tip.cat.out Tue Mar 06 21:44:56 2007 -0800 11.3 @@ -0,0 +1,2 @@ 11.4 +$ \textbf{cat myfile} 11.5 +third change
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/en/examples/backout.non-tip.clone.out Tue Mar 06 21:44:56 2007 -0800 12.3 @@ -0,0 +1,9 @@ 12.4 +$ \textbf{cd ..} 12.5 +$ \textbf{hg clone -r1 myrepo non-tip-repo} 12.6 +requesting all changes 12.7 +adding changesets 12.8 +adding manifests 12.9 +adding file changes 12.10 +added 2 changesets with 2 changes to 1 files 12.11 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 12.12 +$ \textbf{cd non-tip-repo}
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/en/examples/backout.simple.log.out Tue Mar 06 21:44:56 2007 -0800 13.3 @@ -0,0 +1,10 @@ 13.4 +$ \textbf{hg log --style compact} 13.5 +2[tip] 13.6 + back out second change 13.7 + 13.8 +1 13.9 + second change 13.10 + 13.11 +0 13.12 + first change 13.13 +
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/en/examples/backout.simple.out Tue Mar 06 21:44:56 2007 -0800 14.3 @@ -0,0 +1,5 @@ 14.4 +$ \textbf{hg backout -m 'back out second change' tip} 14.5 +reverting myfile 14.6 +changeset backs out changeset 14.7 +$ \textbf{cat myfile} 14.8 +first change
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/en/examples/bisect.commits.out Tue Mar 06 21:44:56 2007 -0800 15.3 @@ -0,0 +1,10 @@ 15.4 +$ \textbf{buggy_change=37} 15.5 +$ \textbf{for (( i = 0; i < 50; i++ )); do} 15.6 +> \textbf{ if [[ $i = $buggy_change ]]; then} 15.7 +> \textbf{ echo 'i have a gub' > myfile$i} 15.8 +> \textbf{ hg commit -q -A -m 'buggy changeset'} 15.9 +> \textbf{ else} 15.10 +> \textbf{ echo 'nothing to see here, move along' > myfile$i} 15.11 +> \textbf{ hg commit -q -A -m 'normal changeset'} 15.12 +> \textbf{ fi} 15.13 +> \textbf{done}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/en/examples/bisect.help.out Tue Mar 06 21:44:56 2007 -0800 16.3 @@ -0,0 +1,2 @@ 16.4 + \textbf{hg help bisect} 16.5 + \textbf{hg bisect help}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/en/examples/bisect.init.out Tue Mar 06 21:44:56 2007 -0800 17.3 @@ -0,0 +1,2 @@ 17.4 +$ \textbf{hg init mybug} 17.5 +$ \textbf{cd mybug}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/en/examples/bisect.search.bad-init.out Tue Mar 06 21:44:56 2007 -0800 18.3 @@ -0,0 +1,1 @@ 18.4 + \textbf{hg bisect bad}
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/en/examples/bisect.search.good-init.out Tue Mar 06 21:44:56 2007 -0800 19.3 @@ -0,0 +1,1 @@ 19.4 + \textbf{hg bisect good 10}
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/en/examples/bisect.search.init.out Tue Mar 06 21:44:56 2007 -0800 20.3 @@ -0,0 +1,1 @@ 20.4 + \textbf{hg bisect init}
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/en/examples/bisect.search.mytest.out Tue Mar 06 21:44:56 2007 -0800 21.3 @@ -0,0 +1,10 @@ 21.4 + \textbf{mytest() \{} 21.5 + \textbf{ if grep -q 'i have a gub' *} 21.6 + \textbf{ then} 21.7 + \textbf{ result=bad} 21.8 + \textbf{ else} 21.9 + \textbf{ result=good} 21.10 + \textbf{ fi} 21.11 + \textbf{ echo this revision is $result} 21.12 + \textbf{ hg bisect $result} 21.13 + \textbf{\}}
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/en/examples/bisect.search.reset.out Tue Mar 06 21:44:56 2007 -0800 22.3 @@ -0,0 +1,1 @@ 22.4 + \textbf{hg bisect reset}
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/en/examples/bisect.search.rest.out Tue Mar 06 21:44:56 2007 -0800 23.3 @@ -0,0 +1,3 @@ 23.4 + \textbf{mytest} 23.5 + \textbf{mytest} 23.6 + \textbf{mytest}
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/en/examples/bisect.search.step1.out Tue Mar 06 21:44:56 2007 -0800 24.3 @@ -0,0 +1,8 @@ 24.4 + \textbf{if grep -q 'i have a gub' *} 24.5 + \textbf{then} 24.6 + \textbf{ result=bad} 24.7 + \textbf{else} 24.8 + \textbf{ result=good} 24.9 + \textbf{fi} 24.10 + \textbf{echo this revision is $result} 24.11 + \textbf{hg bisect $result}
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/en/examples/bisect.search.step2.out Tue Mar 06 21:44:56 2007 -0800 25.3 @@ -0,0 +1,1 @@ 25.4 + \textbf{mytest}
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/en/examples/cmdref.diff-p.out Tue Mar 06 21:44:56 2007 -0800 26.3 @@ -0,0 +1,22 @@ 26.4 +$ \textbf{echo '[diff]' >> $HGRC} 26.5 +$ \textbf{echo 'showfunc = False' >> $HGRC} 26.6 +$ \textbf{hg diff} 26.7 +diff -r myfile.c 26.8 + 26.9 + 26.10 +@@ -1,4 +1,4 @@ 26.11 + int myfunc() 26.12 + \{ 26.13 +- return 1; 26.14 ++ return 10; 26.15 + \} 26.16 +$ \textbf{hg diff -p} 26.17 +diff -r myfile.c 26.18 + 26.19 + 26.20 +@@ -1,4 +1,4 @@ int myfunc() 26.21 + int myfunc() 26.22 + \{ 26.23 +- return 1; 26.24 ++ return 10; 26.25 + \}
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/en/examples/daily.copy.after.out Tue Mar 06 21:44:56 2007 -0800 27.3 @@ -0,0 +1,2 @@ 27.4 +$ \textbf{cp a z} 27.5 +$ \textbf{hg copy --after a z}
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/en/examples/daily.copy.cat.out Tue Mar 06 21:44:56 2007 -0800 28.3 @@ -0,0 +1,5 @@ 28.4 +$ \textbf{cat file} 28.5 +line 28.6 +new contents 28.7 +$ \textbf{cat ../my-copy/new-file} 28.8 +line
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/en/examples/daily.copy.clone.out Tue Mar 06 21:44:56 2007 -0800 29.3 @@ -0,0 +1,3 @@ 29.4 +$ \textbf{cd ..} 29.5 +$ \textbf{hg clone my-copy your-copy} 29.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/en/examples/daily.copy.copy.out Tue Mar 06 21:44:56 2007 -0800 30.3 @@ -0,0 +1,2 @@ 30.4 +$ \textbf{cd my-copy} 30.5 +$ \textbf{hg copy file new-file}
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/en/examples/daily.copy.dir-dest.out Tue Mar 06 21:44:56 2007 -0800 31.3 @@ -0,0 +1,4 @@ 31.4 +$ \textbf{mkdir d} 31.5 +$ \textbf{hg copy a b d} 31.6 +$ \textbf{ls d} 31.7 +a b
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/en/examples/daily.copy.dir-src-dest.out Tue Mar 06 21:44:56 2007 -0800 32.3 @@ -0,0 +1,2 @@ 32.4 +$ \textbf{hg copy c d} 32.5 +copying c/a/c to d/c/a/c
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/en/examples/daily.copy.dir-src.out Tue Mar 06 21:44:56 2007 -0800 33.3 @@ -0,0 +1,2 @@ 33.4 +$ \textbf{hg copy c e} 33.5 +copying c/a/c to e/a/c
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/en/examples/daily.copy.init.out Tue Mar 06 21:44:56 2007 -0800 34.3 @@ -0,0 +1,5 @@ 34.4 +$ \textbf{hg init my-copy} 34.5 +$ \textbf{cd my-copy} 34.6 +$ \textbf{echo line > file} 34.7 +$ \textbf{hg add file} 34.8 +$ \textbf{hg commit -m 'Added a file'}
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/en/examples/daily.copy.merge.out Tue Mar 06 21:44:56 2007 -0800 35.3 @@ -0,0 +1,15 @@ 35.4 +$ \textbf{hg pull ../my-copy} 35.5 +pulling from ../my-copy 35.6 +searching for changes 35.7 +adding changesets 35.8 +adding manifests 35.9 +adding file changes 35.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 35.11 +(run 'hg heads' to see heads, 'hg merge' to merge) 35.12 +$ \textbf{hg merge} 35.13 +merging file and new-file 35.14 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 35.15 +(branch merge, don't forget to commit) 35.16 +$ \textbf{cat new-file} 35.17 +line 35.18 +new contents
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/en/examples/daily.copy.other.out Tue Mar 06 21:44:56 2007 -0800 36.3 @@ -0,0 +1,3 @@ 36.4 +$ \textbf{cd ../your-copy} 36.5 +$ \textbf{echo 'new contents' >> file} 36.6 +$ \textbf{hg commit -m 'Changed file'}
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 37.2 +++ b/en/examples/daily.copy.simple.out Tue Mar 06 21:44:56 2007 -0800 37.3 @@ -0,0 +1,2 @@ 37.4 +$ \textbf{hg copy a c} 37.5 +c/a: not overwriting - file exists
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 38.2 +++ b/en/examples/daily.copy.status-copy.out Tue Mar 06 21:44:56 2007 -0800 38.3 @@ -0,0 +1,4 @@ 38.4 +$ \textbf{hg status -C} 38.5 +A new-file 38.6 + file 38.7 +$ \textbf{hg commit -m 'Copied file'}
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 39.2 +++ b/en/examples/daily.copy.status.out Tue Mar 06 21:44:56 2007 -0800 39.3 @@ -0,0 +1,2 @@ 39.4 +$ \textbf{hg status} 39.5 +A new-file
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 40.2 +++ b/en/examples/daily.files.add-dir.out Tue Mar 06 21:44:56 2007 -0800 40.3 @@ -0,0 +1,10 @@ 40.4 +$ \textbf{mkdir b} 40.5 +$ \textbf{echo b > b/b} 40.6 +$ \textbf{echo c > b/c} 40.7 +$ \textbf{mkdir b/d} 40.8 +$ \textbf{echo d > b/d/d} 40.9 +$ \textbf{hg add b} 40.10 +adding b/b 40.11 +adding b/c 40.12 +adding b/d/d 40.13 +$ \textbf{hg commit -m 'Added all files in subdirectory'}
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/en/examples/daily.files.add.out Tue Mar 06 21:44:56 2007 -0800 41.3 @@ -0,0 +1,10 @@ 41.4 +$ \textbf{hg init add-example} 41.5 +$ \textbf{cd add-example} 41.6 +$ \textbf{echo a > a} 41.7 +$ \textbf{hg status} 41.8 +? a 41.9 +$ \textbf{hg add a} 41.10 +$ \textbf{hg status} 41.11 +A a 41.12 +$ \textbf{hg commit -m 'Added one file'} 41.13 +$ \textbf{hg status}
42.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 42.2 +++ b/en/examples/daily.files.addremove.out Tue Mar 06 21:44:56 2007 -0800 42.3 @@ -0,0 +1,7 @@ 42.4 +$ \textbf{hg init addremove-example} 42.5 +$ \textbf{cd addremove-example} 42.6 +$ \textbf{echo a > a} 42.7 +$ \textbf{echo b > b} 42.8 +$ \textbf{hg addremove} 42.9 +adding a 42.10 +adding b
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 43.2 +++ b/en/examples/daily.files.commit-addremove.out Tue Mar 06 21:44:56 2007 -0800 43.3 @@ -0,0 +1,3 @@ 43.4 +$ \textbf{echo c > c} 43.5 +$ \textbf{hg commit -A -m 'Commit with addremove'} 43.6 +adding c
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 44.2 +++ b/en/examples/daily.files.hidden.out Tue Mar 06 21:44:56 2007 -0800 44.3 @@ -0,0 +1,13 @@ 44.4 +$ \textbf{hg init hidden-example} 44.5 +$ \textbf{cd hidden-example} 44.6 +$ \textbf{mkdir empty} 44.7 +$ \textbf{touch empty/.hidden} 44.8 +$ \textbf{hg add empty/.hidden} 44.9 +$ \textbf{hg commit -m 'Manage an empty-looking directory'} 44.10 +$ \textbf{ls empty} 44.11 +$ \textbf{cd ..} 44.12 +$ \textbf{hg clone hidden-example tmp} 44.13 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 44.14 +$ \textbf{ls tmp} 44.15 +empty 44.16 +$ \textbf{ls tmp/empty}
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 45.2 +++ b/en/examples/daily.files.missing.out Tue Mar 06 21:44:56 2007 -0800 45.3 @@ -0,0 +1,8 @@ 45.4 +$ \textbf{hg init missing-example} 45.5 +$ \textbf{cd missing-example} 45.6 +$ \textbf{echo a > a} 45.7 +$ \textbf{hg add a} 45.8 +$ \textbf{hg commit -m'File about to be missing'} 45.9 +$ \textbf{rm a} 45.10 +$ \textbf{hg status} 45.11 +! a
46.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 46.2 +++ b/en/examples/daily.files.recover-missing.out Tue Mar 06 21:44:56 2007 -0800 46.3 @@ -0,0 +1,4 @@ 46.4 +$ \textbf{hg revert a} 46.5 +$ \textbf{cat a} 46.6 +a 46.7 +$ \textbf{hg status}
47.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 47.2 +++ b/en/examples/daily.files.remove-after.out Tue Mar 06 21:44:56 2007 -0800 47.3 @@ -0,0 +1,3 @@ 47.4 +$ \textbf{hg remove --after a} 47.5 +$ \textbf{hg status} 47.6 +R a
48.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 48.2 +++ b/en/examples/daily.files.remove.out Tue Mar 06 21:44:56 2007 -0800 48.3 @@ -0,0 +1,13 @@ 48.4 +$ \textbf{hg init remove-example} 48.5 +$ \textbf{cd remove-example} 48.6 +$ \textbf{echo a > a} 48.7 +$ \textbf{mkdir b} 48.8 +$ \textbf{echo b > b/b} 48.9 +$ \textbf{hg add a b} 48.10 +adding b/b 48.11 +$ \textbf{hg commit -m 'Small example for file removal'} 48.12 +$ \textbf{hg remove a} 48.13 +$ \textbf{hg status} 48.14 +R a 48.15 +$ \textbf{hg remove b} 48.16 +removing b/b
49.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 49.2 +++ b/en/examples/daily.rename.rename.out Tue Mar 06 21:44:56 2007 -0800 49.3 @@ -0,0 +1,1 @@ 49.4 +$ \textbf{hg rename a b}
50.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 50.2 +++ b/en/examples/daily.rename.status-copy.out Tue Mar 06 21:44:56 2007 -0800 50.3 @@ -0,0 +1,4 @@ 50.4 +$ \textbf{hg status -C} 50.5 +A b 50.6 + a 50.7 +R a
51.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 51.2 +++ b/en/examples/daily.rename.status.out Tue Mar 06 21:44:56 2007 -0800 51.3 @@ -0,0 +1,3 @@ 51.4 +$ \textbf{hg status} 51.5 +A b 51.6 +R a
52.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 52.2 +++ b/en/examples/daily.revert.add.out Tue Mar 06 21:44:56 2007 -0800 52.3 @@ -0,0 +1,7 @@ 52.4 +$ \textbf{echo oops > oops} 52.5 +$ \textbf{hg add oops} 52.6 +$ \textbf{hg status oops} 52.7 +A oops 52.8 +$ \textbf{hg revert oops} 52.9 +$ \textbf{hg status} 52.10 +? oops
53.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 53.2 +++ b/en/examples/daily.revert.copy.out Tue Mar 06 21:44:56 2007 -0800 53.3 @@ -0,0 +1,4 @@ 53.4 +$ \textbf{hg copy file new-file} 53.5 +$ \textbf{hg revert new-file} 53.6 +$ \textbf{hg status} 53.7 +? new-file
54.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 54.2 +++ b/en/examples/daily.revert.missing.out Tue Mar 06 21:44:56 2007 -0800 54.3 @@ -0,0 +1,6 @@ 54.4 +$ \textbf{rm file} 54.5 +$ \textbf{hg status} 54.6 +! file 54.7 +$ \textbf{hg revert file} 54.8 +$ \textbf{ls file} 54.9 +file
55.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 55.2 +++ b/en/examples/daily.revert.modify.out Tue Mar 06 21:44:56 2007 -0800 55.3 @@ -0,0 +1,10 @@ 55.4 +$ \textbf{cat file} 55.5 +original content 55.6 +$ \textbf{echo unwanted change >> file} 55.7 +$ \textbf{hg diff file} 55.8 +diff -r file 55.9 + 55.10 + 55.11 +@@ -1,1 +1,2 @@ original content 55.12 + original content 55.13 ++unwanted change
56.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 56.2 +++ b/en/examples/daily.revert.remove.out Tue Mar 06 21:44:56 2007 -0800 56.3 @@ -0,0 +1,7 @@ 56.4 +$ \textbf{hg remove file} 56.5 +$ \textbf{hg status} 56.6 +R file 56.7 +$ \textbf{hg revert file} 56.8 +$ \textbf{hg status} 56.9 +$ \textbf{ls file} 56.10 +file
57.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 57.2 +++ b/en/examples/daily.revert.rename-orig.out Tue Mar 06 21:44:56 2007 -0800 57.3 @@ -0,0 +1,3 @@ 57.4 +$ \textbf{hg revert file} 57.5 +$ \textbf{hg status} 57.6 +? new-file
58.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 58.2 +++ b/en/examples/daily.revert.rename.out Tue Mar 06 21:44:56 2007 -0800 58.3 @@ -0,0 +1,5 @@ 58.4 +$ \textbf{hg rename file new-file} 58.5 +$ \textbf{hg revert new-file} 58.6 +$ \textbf{hg status} 58.7 +R file 58.8 +? new-file
59.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 59.2 +++ b/en/examples/daily.revert.status.out Tue Mar 06 21:44:56 2007 -0800 59.3 @@ -0,0 +1,5 @@ 59.4 +$ \textbf{hg status} 59.5 +? file.orig 59.6 +$ \textbf{cat file.orig} 59.7 +original content 59.8 +unwanted change
60.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 60.2 +++ b/en/examples/daily.revert.unmodify.out Tue Mar 06 21:44:56 2007 -0800 60.3 @@ -0,0 +1,5 @@ 60.4 +$ \textbf{hg status} 60.5 +M file 60.6 +$ \textbf{hg revert file} 60.7 +$ \textbf{cat file} 60.8 +original content
61.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 61.2 +++ b/en/examples/filenames.dirs.out Tue Mar 06 21:44:56 2007 -0800 61.3 @@ -0,0 +1,5 @@ 61.4 +$ \textbf{hg status src} 61.5 +? src/main.py 61.6 +? src/watcher/_watcher.c 61.7 +? src/watcher/watcher.py 61.8 +? src/xyzzy.txt
62.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 62.2 +++ b/en/examples/filenames.files.out Tue Mar 06 21:44:56 2007 -0800 62.3 @@ -0,0 +1,1 @@ 62.4 +$ \textbf{hg add COPYING README examples/simple.py}
63.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 63.2 +++ b/en/examples/filenames.filter.exclude.out Tue Mar 06 21:44:56 2007 -0800 63.3 @@ -0,0 +1,3 @@ 63.4 +$ \textbf{hg status -X '**.py' src} 63.5 +? src/watcher/_watcher.c 63.6 +? src/xyzzy.txt
64.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 64.2 +++ b/en/examples/filenames.filter.include.out Tue Mar 06 21:44:56 2007 -0800 64.3 @@ -0,0 +1,2 @@ 64.4 +$ \textbf{hg status -I '*.in'} 64.5 +? MANIFEST.in
65.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 65.2 +++ b/en/examples/filenames.glob.group.out Tue Mar 06 21:44:56 2007 -0800 65.3 @@ -0,0 +1,3 @@ 65.4 +$ \textbf{hg status 'glob:*.\{in,py\}'} 65.5 +? MANIFEST.in 65.6 +? setup.py
66.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 66.2 +++ b/en/examples/filenames.glob.question.out Tue Mar 06 21:44:56 2007 -0800 66.3 @@ -0,0 +1,2 @@ 66.4 +$ \textbf{hg status 'glob:**.?'} 66.5 +? src/watcher/_watcher.c
67.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 67.2 +++ b/en/examples/filenames.glob.range.out Tue Mar 06 21:44:56 2007 -0800 67.3 @@ -0,0 +1,3 @@ 67.4 +$ \textbf{hg status 'glob:**[nr-t]'} 67.5 +? MANIFEST.in 67.6 +? src/xyzzy.txt
68.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 68.2 +++ b/en/examples/filenames.glob.star-starstar.out Tue Mar 06 21:44:56 2007 -0800 68.3 @@ -0,0 +1,8 @@ 68.4 +$ \textbf{hg status 'glob:*.py'} 68.5 +? setup.py 68.6 +$ \textbf{hg status 'glob:**.py'} 68.7 +A examples/simple.py 68.8 +A src/main.py 68.9 +? examples/performant.py 68.10 +? setup.py 68.11 +? src/watcher/watcher.py
69.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 69.2 +++ b/en/examples/filenames.glob.star.out Tue Mar 06 21:44:56 2007 -0800 69.3 @@ -0,0 +1,2 @@ 69.4 +$ \textbf{hg add 'glob:*.py'} 69.5 +adding main.py
70.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 70.2 +++ b/en/examples/filenames.glob.starstar.out Tue Mar 06 21:44:56 2007 -0800 70.3 @@ -0,0 +1,7 @@ 70.4 +$ \textbf{cd ..} 70.5 +$ \textbf{hg status 'glob:**.py'} 70.6 +A examples/simple.py 70.7 +A src/main.py 70.8 +? examples/performant.py 70.9 +? setup.py 70.10 +? src/watcher/watcher.py
71.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 71.2 +++ b/en/examples/filenames.wdir-relname.out Tue Mar 06 21:44:56 2007 -0800 71.3 @@ -0,0 +1,22 @@ 71.4 +$ \textbf{hg status} 71.5 +A COPYING 71.6 +A README 71.7 +A examples/simple.py 71.8 +? MANIFEST.in 71.9 +? examples/performant.py 71.10 +? setup.py 71.11 +? src/main.py 71.12 +? src/watcher/_watcher.c 71.13 +? src/watcher/watcher.py 71.14 +? src/xyzzy.txt 71.15 +$ \textbf{hg status `hg root`} 71.16 +A ../COPYING 71.17 +A ../README 71.18 +A ../examples/simple.py 71.19 +? ../MANIFEST.in 71.20 +? ../examples/performant.py 71.21 +? ../setup.py 71.22 +? main.py 71.23 +? watcher/_watcher.c 71.24 +? watcher/watcher.py 71.25 +? xyzzy.txt
72.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 72.2 +++ b/en/examples/filenames.wdir-subdir.out Tue Mar 06 21:44:56 2007 -0800 72.3 @@ -0,0 +1,14 @@ 72.4 +$ \textbf{cd src} 72.5 +$ \textbf{hg add -n} 72.6 +adding ../MANIFEST.in 72.7 +adding ../examples/performant.py 72.8 +adding ../setup.py 72.9 +adding main.py 72.10 +adding watcher/_watcher.c 72.11 +adding watcher/watcher.py 72.12 +adding xyzzy.txt 72.13 +$ \textbf{hg add -n .} 72.14 +adding main.py 72.15 +adding watcher/_watcher.c 72.16 +adding watcher/watcher.py 72.17 +adding xyzzy.txt
73.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 73.2 +++ b/en/examples/hook.msglen.run.out Tue Mar 06 21:44:56 2007 -0800 73.3 @@ -0,0 +1,10 @@ 73.4 +$ \textbf{cat .hg/hgrc} 73.5 +[hooks] 73.6 +pretxncommit.msglen = test `hg tip --template \{desc\} | wc -c` -ge 10 73.7 +$ \textbf{echo a > a} 73.8 +$ \textbf{hg add a} 73.9 +$ \textbf{hg commit -A -m 'too short'} 73.10 +abort: pretxncommit.msglen hook exited with status 1 73.11 +transaction abort! 73.12 +rollback completed 73.13 +$ \textbf{hg commit -A -m 'long enough'}
74.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 74.2 +++ b/en/examples/hook.simple.ext.out Tue Mar 06 21:44:56 2007 -0800 74.3 @@ -0,0 +1,5 @@ 74.4 +$ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc} 74.5 +$ \textbf{echo a >> a} 74.6 +$ \textbf{hg commit -m 'i have two hooks'} 74.7 +committed 74.8 +
75.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 75.2 +++ b/en/examples/hook.simple.init.out Tue Mar 06 21:44:56 2007 -0800 75.3 @@ -0,0 +1,11 @@ 75.4 +$ \textbf{hg init hook-test} 75.5 +$ \textbf{cd hook-test} 75.6 +$ \textbf{echo '[hooks]' >> .hg/hgrc} 75.7 +$ \textbf{echo 'commit = echo committed $HG_NODE' >> .hg/hgrc} 75.8 +$ \textbf{cat .hg/hgrc} 75.9 +[hooks] 75.10 +commit = echo committed $HG_NODE 75.11 +$ \textbf{echo a > a} 75.12 +$ \textbf{hg add a} 75.13 +$ \textbf{hg commit -m 'testing commit hook'} 75.14 +committed
76.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 76.2 +++ b/en/examples/hook.simple.pretxncommit.out Tue Mar 06 21:44:56 2007 -0800 76.3 @@ -0,0 +1,13 @@ 76.4 +$ \textbf{cat check_bug_id} 76.5 +#!/bin/sh 76.6 +# check that a commit comment mentions a numeric bug id 76.7 +hg log -r $1 --template \{desc\} | grep -q "\textbackslash{}<bug *[0-9]" 76.8 +$ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc} 76.9 +$ \textbf{echo a >> a} 76.10 +$ \textbf{hg commit -m 'i am not mentioning a bug id'} 76.11 +abort: pretxncommit.bug_id_required hook exited with status 1 76.12 +transaction abort! 76.13 +rollback completed 76.14 +$ \textbf{hg commit -m 'i refer you to bug 666'} 76.15 +committed 76.16 +
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 77.2 +++ b/en/examples/hook.ws.better.out Tue Mar 06 21:44:56 2007 -0800 77.3 @@ -0,0 +1,106 @@ 77.4 +$ \textbf{cat .hg/hgrc} 77.5 +[hooks] 77.6 +pretxncommit.whitespace = check_whitespace.py 77.7 +$ \textbf{echo 'a ' >> a} 77.8 +$ \textbf{hg commit -A -m 'add new line with trailing whitespace'} 77.9 +adding check_whitespace.py 77.10 +a, line 2: trailing whitespace added 77.11 +check_whitespace.py, line 1: trailing whitespace added 77.12 +check_whitespace.py, line 2: trailing whitespace added 77.13 +check_whitespace.py, line 3: trailing whitespace added 77.14 +check_whitespace.py, line 4: trailing whitespace added 77.15 +check_whitespace.py, line 5: trailing whitespace added 77.16 +check_whitespace.py, line 6: trailing whitespace added 77.17 +check_whitespace.py, line 7: trailing whitespace added 77.18 +check_whitespace.py, line 8: trailing whitespace added 77.19 +check_whitespace.py, line 9: trailing whitespace added 77.20 +check_whitespace.py, line 10: trailing whitespace added 77.21 +check_whitespace.py, line 11: trailing whitespace added 77.22 +check_whitespace.py, line 12: trailing whitespace added 77.23 +check_whitespace.py, line 13: trailing whitespace added 77.24 +check_whitespace.py, line 14: trailing whitespace added 77.25 +check_whitespace.py, line 15: trailing whitespace added 77.26 +check_whitespace.py, line 16: trailing whitespace added 77.27 +check_whitespace.py, line 17: trailing whitespace added 77.28 +check_whitespace.py, line 18: trailing whitespace added 77.29 +check_whitespace.py, line 19: trailing whitespace added 77.30 +check_whitespace.py, line 20: trailing whitespace added 77.31 +check_whitespace.py, line 21: trailing whitespace added 77.32 +check_whitespace.py, line 22: trailing whitespace added 77.33 +check_whitespace.py, line 23: trailing whitespace added 77.34 +check_whitespace.py, line 24: trailing whitespace added 77.35 +check_whitespace.py, line 25: trailing whitespace added 77.36 +check_whitespace.py, line 26: trailing whitespace added 77.37 +check_whitespace.py, line 27: trailing whitespace added 77.38 +check_whitespace.py, line 28: trailing whitespace added 77.39 +check_whitespace.py, line 29: trailing whitespace added 77.40 +check_whitespace.py, line 30: trailing whitespace added 77.41 +check_whitespace.py, line 31: trailing whitespace added 77.42 +check_whitespace.py, line 32: trailing whitespace added 77.43 +check_whitespace.py, line 33: trailing whitespace added 77.44 +check_whitespace.py, line 34: trailing whitespace added 77.45 +check_whitespace.py, line 35: trailing whitespace added 77.46 +check_whitespace.py, line 36: trailing whitespace added 77.47 +check_whitespace.py, line 37: trailing whitespace added 77.48 +check_whitespace.py, line 38: trailing whitespace added 77.49 +check_whitespace.py, line 39: trailing whitespace added 77.50 +check_whitespace.py, line 40: trailing whitespace added 77.51 +check_whitespace.py, line 41: trailing whitespace added 77.52 +check_whitespace.py, line 42: trailing whitespace added 77.53 +check_whitespace.py, line 43: trailing whitespace added 77.54 +check_whitespace.py, line 44: trailing whitespace added 77.55 +commit message saved to .hg/commit.save 77.56 +abort: pretxncommit.whitespace hook exited with status 1 77.57 +transaction abort! 77.58 +rollback completed 77.59 +$ \textbf{perl -pi -e 's,\textbackslash{}s+$,,' a} 77.60 +$ \textbf{hg commit -A -m 'trimmed trailing whitespace'} 77.61 +a, line 1: trailing whitespace added 77.62 +check_whitespace.py, line 1: trailing whitespace added 77.63 +check_whitespace.py, line 2: trailing whitespace added 77.64 +check_whitespace.py, line 3: trailing whitespace added 77.65 +check_whitespace.py, line 4: trailing whitespace added 77.66 +check_whitespace.py, line 5: trailing whitespace added 77.67 +check_whitespace.py, line 6: trailing whitespace added 77.68 +check_whitespace.py, line 7: trailing whitespace added 77.69 +check_whitespace.py, line 8: trailing whitespace added 77.70 +check_whitespace.py, line 9: trailing whitespace added 77.71 +check_whitespace.py, line 10: trailing whitespace added 77.72 +check_whitespace.py, line 11: trailing whitespace added 77.73 +check_whitespace.py, line 12: trailing whitespace added 77.74 +check_whitespace.py, line 13: trailing whitespace added 77.75 +check_whitespace.py, line 14: trailing whitespace added 77.76 +check_whitespace.py, line 15: trailing whitespace added 77.77 +check_whitespace.py, line 16: trailing whitespace added 77.78 +check_whitespace.py, line 17: trailing whitespace added 77.79 +check_whitespace.py, line 18: trailing whitespace added 77.80 +check_whitespace.py, line 19: trailing whitespace added 77.81 +check_whitespace.py, line 20: trailing whitespace added 77.82 +check_whitespace.py, line 21: trailing whitespace added 77.83 +check_whitespace.py, line 22: trailing whitespace added 77.84 +check_whitespace.py, line 23: trailing whitespace added 77.85 +check_whitespace.py, line 24: trailing whitespace added 77.86 +check_whitespace.py, line 25: trailing whitespace added 77.87 +check_whitespace.py, line 26: trailing whitespace added 77.88 +check_whitespace.py, line 27: trailing whitespace added 77.89 +check_whitespace.py, line 28: trailing whitespace added 77.90 +check_whitespace.py, line 29: trailing whitespace added 77.91 +check_whitespace.py, line 30: trailing whitespace added 77.92 +check_whitespace.py, line 31: trailing whitespace added 77.93 +check_whitespace.py, line 32: trailing whitespace added 77.94 +check_whitespace.py, line 33: trailing whitespace added 77.95 +check_whitespace.py, line 34: trailing whitespace added 77.96 +check_whitespace.py, line 35: trailing whitespace added 77.97 +check_whitespace.py, line 36: trailing whitespace added 77.98 +check_whitespace.py, line 37: trailing whitespace added 77.99 +check_whitespace.py, line 38: trailing whitespace added 77.100 +check_whitespace.py, line 39: trailing whitespace added 77.101 +check_whitespace.py, line 40: trailing whitespace added 77.102 +check_whitespace.py, line 41: trailing whitespace added 77.103 +check_whitespace.py, line 42: trailing whitespace added 77.104 +check_whitespace.py, line 43: trailing whitespace added 77.105 +check_whitespace.py, line 44: trailing whitespace added 77.106 +commit message saved to .hg/commit.save 77.107 +abort: pretxncommit.whitespace hook exited with status 1 77.108 +transaction abort! 77.109 +rollback completed
78.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 78.2 +++ b/en/examples/hook.ws.simple.out Tue Mar 06 21:44:56 2007 -0800 78.3 @@ -0,0 +1,11 @@ 78.4 +$ \textbf{cat .hg/hgrc} 78.5 +[hooks] 78.6 +pretxncommit.whitespace = hg export tip | (! grep -qP '^\textbackslash{}+.*[ \textbackslash{}t]$') 78.7 +$ \textbf{echo 'a ' > a} 78.8 +$ \textbf{hg commit -A -m 'test with trailing whitespace'} 78.9 +adding a 78.10 +abort: pretxncommit.whitespace hook exited with status 1 78.11 +transaction abort! 78.12 +rollback completed 78.13 +$ \textbf{echo 'a' > a} 78.14 +$ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
79.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 79.2 +++ b/en/examples/mq.dodiff.diff.out Tue Mar 06 21:44:56 2007 -0800 79.3 @@ -0,0 +1,13 @@ 79.4 +$ \textbf{echo 'this is my first line' > oldfile} 79.5 +$ \textbf{echo 'my first line is here' > newfile} 79.6 +$ \textbf{diff -u oldfile newfile > tiny.patch} 79.7 +$ \textbf{cat tiny.patch} 79.8 + 79.9 + 79.10 +@@ -1 +1 @@ 79.11 +-this is my first line 79.12 ++my first line is here 79.13 +$ \textbf{patch < tiny.patch} 79.14 +patching file oldfile 79.15 +$ \textbf{cat newfile} 79.16 +my first line is here
80.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 80.2 +++ b/en/examples/mq.guards.init.out Tue Mar 06 21:44:56 2007 -0800 80.3 @@ -0,0 +1,9 @@ 80.4 +$ \textbf{hg qinit} 80.5 +$ \textbf{hg qnew hello.patch} 80.6 +$ \textbf{echo hello > hello} 80.7 +$ \textbf{hg add hello} 80.8 +$ \textbf{hg qrefresh} 80.9 +$ \textbf{hg qnew goodbye.patch} 80.10 +$ \textbf{echo goodbye > goodbye} 80.11 +$ \textbf{hg add goodbye} 80.12 +$ \textbf{hg qrefresh}
81.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 81.2 +++ b/en/examples/mq.guards.qguard.neg.out Tue Mar 06 21:44:56 2007 -0800 81.3 @@ -0,0 +1,3 @@ 81.4 +$ \textbf{hg qguard hello.patch -quux} 81.5 +$ \textbf{hg qguard hello.patch} 81.6 +hello.patch: -quux
82.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 82.2 +++ b/en/examples/mq.guards.qguard.out Tue Mar 06 21:44:56 2007 -0800 82.3 @@ -0,0 +1,2 @@ 82.4 +$ \textbf{hg qguard} 82.5 +goodbye.patch: unguarded
83.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 83.2 +++ b/en/examples/mq.guards.qguard.pos.out Tue Mar 06 21:44:56 2007 -0800 83.3 @@ -0,0 +1,3 @@ 83.4 +$ \textbf{hg qguard +foo} 83.5 +$ \textbf{hg qguard} 83.6 +goodbye.patch: +foo
84.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 84.2 +++ b/en/examples/mq.guards.qselect.cat.out Tue Mar 06 21:44:56 2007 -0800 84.3 @@ -0,0 +1,2 @@ 84.4 +$ \textbf{cat .hg/patches/guards} 84.5 +foo
85.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 85.2 +++ b/en/examples/mq.guards.qselect.error.out Tue Mar 06 21:44:56 2007 -0800 85.3 @@ -0,0 +1,2 @@ 85.4 +$ \textbf{hg qselect +foo} 85.5 +abort: guard '+foo' starts with invalid character: '+'
86.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 86.2 +++ b/en/examples/mq.guards.qselect.foo.out Tue Mar 06 21:44:56 2007 -0800 86.3 @@ -0,0 +1,8 @@ 86.4 +$ \textbf{hg qpop -a} 86.5 +Patch queue now empty 86.6 +$ \textbf{hg qselect} 86.7 +no active guards 86.8 +$ \textbf{hg qselect foo} 86.9 +number of unguarded, unapplied patches has changed from 1 to 2 86.10 +$ \textbf{hg qselect} 86.11 +foo
87.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 87.2 +++ b/en/examples/mq.guards.qselect.foobar.out Tue Mar 06 21:44:56 2007 -0800 87.3 @@ -0,0 +1,8 @@ 87.4 +$ \textbf{hg qselect foo bar} 87.5 +number of unguarded, unapplied patches has changed from 0 to 2 87.6 +$ \textbf{hg qpop -a} 87.7 +no patches applied 87.8 +$ \textbf{hg qpush -a} 87.9 +applying hello.patch 87.10 +applying goodbye.patch 87.11 +Now at: goodbye.patch
88.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 88.2 +++ b/en/examples/mq.guards.qselect.qpush.out Tue Mar 06 21:44:56 2007 -0800 88.3 @@ -0,0 +1,4 @@ 88.4 +$ \textbf{hg qpush -a} 88.5 +applying hello.patch 88.6 +applying goodbye.patch 88.7 +Now at: goodbye.patch
89.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 89.2 +++ b/en/examples/mq.guards.qselect.quux.out Tue Mar 06 21:44:56 2007 -0800 89.3 @@ -0,0 +1,6 @@ 89.4 +$ \textbf{hg qselect quux} 89.5 +number of guarded, applied patches has changed from 0 to 2 89.6 +$ \textbf{hg qpop -a} 89.7 +Patch queue now empty 89.8 +$ \textbf{hg qpush -a} 89.9 +patch series already fully applied
90.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 90.2 +++ b/en/examples/mq.guards.series.out Tue Mar 06 21:44:56 2007 -0800 90.3 @@ -0,0 +1,3 @@ 90.4 +$ \textbf{cat .hg/patches/series} 90.5 +hello.patch #-quux 90.6 +goodbye.patch #+foo
91.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 91.2 +++ b/en/examples/mq.id.out.out Tue Mar 06 21:44:56 2007 -0800 91.3 @@ -0,0 +1,32 @@ 91.4 +$ \textbf{hg qapplied} 91.5 +first.patch 91.6 +second.patch 91.7 +$ \textbf{hg log -r qbase:qtip} 91.8 +changeset: 91.9 +tag: first.patch 91.10 +tag: qbase 91.11 +user: Bryan O'Sullivan <bos@serpentine.com> 91.12 + 91.13 +summary: patch queue: first.patch 91.14 + 91.15 +changeset: 91.16 +tag: second.patch 91.17 +tag: qtip 91.18 +tag: tip 91.19 +user: Bryan O'Sullivan <bos@serpentine.com> 91.20 + 91.21 +summary: patch queue: second.patch 91.22 + 91.23 +$ \textbf{hg export second.patch} 91.24 +# HG changeset patch 91.25 +# User Bryan O'Sullivan <bos@serpentine.com> 91.26 + 91.27 +# Node ID 91.28 +# Parent 91.29 +patch queue: second.patch 91.30 + 91.31 +diff -r -r other.c 91.32 + 91.33 + 91.34 +@@ -0,0 +1,1 @@ 91.35 ++double u;
92.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 92.2 +++ b/en/examples/mq.qinit-help.help.out Tue Mar 06 21:44:56 2007 -0800 92.3 @@ -0,0 +1,13 @@ 92.4 +$ \textbf{hg help qinit} 92.5 +hg qinit [-c] 92.6 + 92.7 +init a new queue repository 92.8 + 92.9 + The queue repository is unversioned by default. If -c is 92.10 + specified, qinit will create a separate nested repository 92.11 + for patches. Use qcommit to commit changes to this queue 92.12 + repository. 92.13 + 92.14 +options: 92.15 + 92.16 + -c --create-repo create queue repository
93.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 93.2 +++ b/en/examples/mq.tarball.download.out Tue Mar 06 21:44:56 2007 -0800 93.3 @@ -0,0 +1,8 @@ 93.4 +$ \textbf{download netplug-1.2.5.tar.bz2} 93.5 +$ \textbf{tar jxf netplug-1.2.5.tar.bz2} 93.6 +$ \textbf{cd netplug-1.2.5} 93.7 +$ \textbf{hg init} 93.8 +$ \textbf{hg commit -q --addremove --message netplug-1.2.5} 93.9 +$ \textbf{cd ..} 93.10 +$ \textbf{hg clone netplug-1.2.5 netplug} 93.11 +18 files updated, 0 files merged, 0 files removed, 0 files unresolved
94.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 94.2 +++ b/en/examples/mq.tarball.newsource.out Tue Mar 06 21:44:56 2007 -0800 94.3 @@ -0,0 +1,12 @@ 94.4 +$ \textbf{hg qpop -a} 94.5 +Patch queue now empty 94.6 +$ \textbf{cd ..} 94.7 +$ \textbf{download netplug-1.2.8.tar.bz2} 94.8 +$ \textbf{hg clone netplug-1.2.5 netplug-1.2.8} 94.9 +18 files updated, 0 files merged, 0 files removed, 0 files unresolved 94.10 +$ \textbf{cd netplug-1.2.8} 94.11 +$ \textbf{hg locate -0 | xargs -0 rm} 94.12 +$ \textbf{cd ..} 94.13 +$ \textbf{tar jxf netplug-1.2.8.tar.bz2} 94.14 +$ \textbf{cd netplug-1.2.8} 94.15 +$ \textbf{hg commit --addremove --message netplug-1.2.8}
95.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 95.2 +++ b/en/examples/mq.tarball.qinit.out Tue Mar 06 21:44:56 2007 -0800 95.3 @@ -0,0 +1,28 @@ 95.4 +$ \textbf{cd netplug} 95.5 +$ \textbf{hg qinit} 95.6 +$ \textbf{hg qnew -m 'fix build problem with gcc 4' build-fix.patch} 95.7 +$ \textbf{perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c} 95.8 +$ \textbf{hg qrefresh} 95.9 +$ \textbf{hg tip -p} 95.10 +changeset: 95.11 +tag: qtip 95.12 +tag: build-fix.patch 95.13 +tag: tip 95.14 +tag: qbase 95.15 +user: Bryan O'Sullivan <bos@serpentine.com> 95.16 + 95.17 +summary: fix build problem with gcc 4 95.18 + 95.19 +diff -r -r netlink.c 95.20 + 95.21 + 95.22 +@@ -275,7 +275,7 @@ netlink_open(void) 95.23 + exit(1); 95.24 + \} 95.25 + 95.26 +- int addr_len = sizeof(addr); 95.27 ++ socklen_t addr_len = sizeof(addr); 95.28 + 95.29 + if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) \{ 95.30 + do_log(LOG_ERR, "Could not get socket details: %m"); 95.31 +
96.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 96.2 +++ b/en/examples/mq.tarball.repush.out Tue Mar 06 21:44:56 2007 -0800 96.3 @@ -0,0 +1,12 @@ 96.4 +$ \textbf{cd ../netplug} 96.5 +$ \textbf{hg pull ../netplug-1.2.8} 96.6 +pulling from ../netplug-1.2.8 96.7 +searching for changes 96.8 +adding changesets 96.9 +adding manifests 96.10 +adding file changes 96.11 +added 1 changesets with 12 changes to 12 files 96.12 +(run 'hg update' to get a working copy) 96.13 +$ \textbf{hg qpush -a} 96.14 +applying build-fix.patch 96.15 +Now at: build-fix.patch
97.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 97.2 +++ b/en/examples/mq.tools.lsdiff.out Tue Mar 06 21:44:56 2007 -0800 97.3 @@ -0,0 +1,21 @@ 97.4 +$ \textbf{lsdiff -nvv remove-redundant-null-checks.patch} 97.5 +22 File #1 a/drivers/char/agp/sgi-agp.c 97.6 + 24 Hunk #1 static int __devinit agp_sgi_init(void) 97.7 +37 File #2 a/drivers/char/hvcs.c 97.8 + 39 Hunk #1 static struct tty_operations hvcs_ops = 97.9 + 53 Hunk #2 static int hvcs_alloc_index_list(int n) 97.10 +69 File #3 a/drivers/message/fusion/mptfc.c 97.11 + 71 Hunk #1 mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in 97.12 +85 File #4 a/drivers/message/fusion/mptsas.c 97.13 + 87 Hunk #1 mptsas_probe_hba_phys(MPT_ADAPTER *ioc) 97.14 +98 File #5 a/drivers/net/fs_enet/fs_enet-mii.c 97.15 + 100 Hunk #1 static struct fs_enet_mii_bus *create_bu 97.16 +111 File #6 a/drivers/net/wireless/ipw2200.c 97.17 + 113 Hunk #1 static struct ipw_fw_error *ipw_alloc_er 97.18 + 126 Hunk #2 static ssize_t clear_error(struct device 97.19 + 140 Hunk #3 static void ipw_irq_tasklet(struct ipw_p 97.20 + 150 Hunk #4 static void ipw_pci_remove(struct pci_de 97.21 +164 File #7 a/drivers/scsi/libata-scsi.c 97.22 + 166 Hunk #1 int ata_cmd_ioctl(struct scsi_device *sc 97.23 +178 File #8 a/drivers/video/au1100fb.c 97.24 + 180 Hunk #1 void __exit au1100fb_cleanup(void)
98.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 98.2 +++ b/en/examples/mq.tools.tools.out Tue Mar 06 21:44:56 2007 -0800 98.3 @@ -0,0 +1,23 @@ 98.4 +$ \textbf{diffstat -p1 remove-redundant-null-checks.patch} 98.5 + drivers/char/agp/sgi-agp.c | 5 ++--- 98.6 + drivers/char/hvcs.c | 11 +++++------ 98.7 + drivers/message/fusion/mptfc.c | 6 ++---- 98.8 + drivers/message/fusion/mptsas.c | 3 +-- 98.9 + drivers/net/fs_enet/fs_enet-mii.c | 3 +-- 98.10 + drivers/net/wireless/ipw2200.c | 22 ++++++---------------- 98.11 + drivers/scsi/libata-scsi.c | 4 +--- 98.12 + drivers/video/au1100fb.c | 3 +-- 98.13 + 8 files changed, 19 insertions(+), 38 deletions(-) 98.14 +$ \textbf{filterdiff -i '*/video/*' remove-redundant-null-checks.patch} 98.15 + 98.16 + 98.17 +@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void) 98.18 + \{ 98.19 + driver_unregister(&au1100fb_driver); 98.20 + 98.21 +- if (drv_info.opt_mode) 98.22 +- kfree(drv_info.opt_mode); 98.23 ++ kfree(drv_info.opt_mode); 98.24 + \} 98.25 + 98.26 + module_init(au1100fb_init);
99.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 99.2 +++ b/en/examples/mq.tutorial.add.out Tue Mar 06 21:44:56 2007 -0800 99.3 @@ -0,0 +1,4 @@ 99.4 +$ \textbf{echo 'file 3, line 1' >> file3} 99.5 +$ \textbf{hg qnew add-file3.patch} 99.6 +$ \textbf{hg qnew -f add-file3.patch} 99.7 +abort: patch "add-file3.patch" already exists
100.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 100.2 +++ b/en/examples/mq.tutorial.qinit.out Tue Mar 06 21:44:56 2007 -0800 100.3 @@ -0,0 +1,7 @@ 100.4 +$ \textbf{hg init mq-sandbox} 100.5 +$ \textbf{cd mq-sandbox} 100.6 +$ \textbf{echo 'line 1' > file1} 100.7 +$ \textbf{echo 'another line 1' > file2} 100.8 +$ \textbf{hg add file1 file2} 100.9 +$ \textbf{hg commit -m'first change'} 100.10 +$ \textbf{hg qinit}
101.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 101.2 +++ b/en/examples/mq.tutorial.qnew.out Tue Mar 06 21:44:56 2007 -0800 101.3 @@ -0,0 +1,20 @@ 101.4 +$ \textbf{hg tip} 101.5 +changeset: 101.6 +tag: tip 101.7 +user: Bryan O'Sullivan <bos@serpentine.com> 101.8 + 101.9 +summary: first change 101.10 + 101.11 +$ \textbf{hg qnew first.patch} 101.12 +$ \textbf{hg tip} 101.13 +changeset: 101.14 +tag: qtip 101.15 +tag: first.patch 101.16 +tag: tip 101.17 +tag: qbase 101.18 +user: Bryan O'Sullivan <bos@serpentine.com> 101.19 + 101.20 +summary: New patch: first.patch 101.21 + 101.22 +$ \textbf{ls .hg/patches} 101.23 +first.patch series status
102.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 102.2 +++ b/en/examples/mq.tutorial.qnew2.out Tue Mar 06 21:44:56 2007 -0800 102.3 @@ -0,0 +1,28 @@ 102.4 +$ \textbf{hg qnew second.patch} 102.5 +$ \textbf{hg log --style=compact --limit=2} 102.6 +2[second.patch,qtip,tip] 102.7 + New patch: second.patch 102.8 + 102.9 +1[first.patch,qbase] 102.10 + patch queue: first.patch 102.11 + 102.12 +$ \textbf{echo 'line 4' >> file1} 102.13 +$ \textbf{hg qrefresh} 102.14 +$ \textbf{hg tip --style=compact --patch} 102.15 +2[second.patch,qtip,tip] 102.16 + patch queue: second.patch 102.17 + 102.18 +diff -r -r file1 102.19 + 102.20 + 102.21 +@@ -1,3 +1,4 @@ line 1 102.22 + line 1 102.23 + line 2 102.24 + line 3 102.25 ++line 4 102.26 + 102.27 +$ \textbf{hg annotate file1} 102.28 +0: line 1 102.29 +1: line 2 102.30 +1: line 3 102.31 +2: line 4
103.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 103.2 +++ b/en/examples/mq.tutorial.qpop.out Tue Mar 06 21:44:56 2007 -0800 103.3 @@ -0,0 +1,14 @@ 103.4 +$ \textbf{hg qapplied} 103.5 +first.patch 103.6 +second.patch 103.7 +$ \textbf{hg qpop} 103.8 +Now at: first.patch 103.9 +$ \textbf{hg qseries} 103.10 +first.patch 103.11 +second.patch 103.12 +$ \textbf{hg qapplied} 103.13 +first.patch 103.14 +$ \textbf{cat file1} 103.15 +line 1 103.16 +line 2 103.17 +line 3
104.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 104.2 +++ b/en/examples/mq.tutorial.qpush-a.out Tue Mar 06 21:44:56 2007 -0800 104.3 @@ -0,0 +1,8 @@ 104.4 +$ \textbf{hg qpush -a} 104.5 +applying second.patch 104.6 +Now at: second.patch 104.7 +$ \textbf{cat file1} 104.8 +line 1 104.9 +line 2 104.10 +line 3 104.11 +line 4
105.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 105.2 +++ b/en/examples/mq.tutorial.qrefresh.out Tue Mar 06 21:44:56 2007 -0800 105.3 @@ -0,0 +1,21 @@ 105.4 +$ \textbf{echo 'line 2' >> file1} 105.5 +$ \textbf{hg diff} 105.6 +diff -r file1 105.7 + 105.8 + 105.9 +@@ -1,1 +1,2 @@ line 1 105.10 + line 1 105.11 ++line 2 105.12 +$ \textbf{hg qrefresh} 105.13 +$ \textbf{hg diff} 105.14 +$ \textbf{hg tip --style=compact --patch} 105.15 +1[qtip,first.patch,tip,qbase] 105.16 + patch queue: first.patch 105.17 + 105.18 +diff -r -r file1 105.19 + 105.20 + 105.21 +@@ -1,1 +1,2 @@ line 1 105.22 + line 1 105.23 ++line 2 105.24 +
106.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 106.2 +++ b/en/examples/mq.tutorial.qrefresh2.out Tue Mar 06 21:44:56 2007 -0800 106.3 @@ -0,0 +1,16 @@ 106.4 +$ \textbf{echo 'line 3' >> file1} 106.5 +$ \textbf{hg status} 106.6 +M file1 106.7 +$ \textbf{hg qrefresh} 106.8 +$ \textbf{hg tip --style=compact --patch} 106.9 +1[qtip,first.patch,tip,qbase] 106.10 + patch queue: first.patch 106.11 + 106.12 +diff -r -r file1 106.13 + 106.14 + 106.15 +@@ -1,1 +1,3 @@ line 1 106.16 + line 1 106.17 ++line 2 106.18 ++line 3 106.19 +
107.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 107.2 +++ b/en/examples/mq.tutorial.qseries.out Tue Mar 06 21:44:56 2007 -0800 107.3 @@ -0,0 +1,6 @@ 107.4 +$ \textbf{hg qseries} 107.5 +first.patch 107.6 +second.patch 107.7 +$ \textbf{hg qapplied} 107.8 +first.patch 107.9 +second.patch
108.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 108.2 +++ b/en/examples/rollback.add.out Tue Mar 06 21:44:56 2007 -0800 108.3 @@ -0,0 +1,2 @@ 108.4 +$ \textbf{hg add b} 108.5 +$ \textbf{hg commit -m 'Add file b, this time for real'}
109.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 109.2 +++ b/en/examples/rollback.commit.out Tue Mar 06 21:44:56 2007 -0800 109.3 @@ -0,0 +1,4 @@ 109.4 +$ \textbf{hg status} 109.5 +M a 109.6 +$ \textbf{echo b > b} 109.7 +$ \textbf{hg commit -m 'Add file b'}
110.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 110.2 +++ b/en/examples/rollback.rollback.out Tue Mar 06 21:44:56 2007 -0800 110.3 @@ -0,0 +1,12 @@ 110.4 +$ \textbf{hg rollback} 110.5 +rolling back last transaction 110.6 +$ \textbf{hg tip} 110.7 +changeset: 110.8 +tag: tip 110.9 +user: Bryan O'Sullivan <bos@serpentine.com> 110.10 + 110.11 +summary: First commit 110.12 + 110.13 +$ \textbf{hg status} 110.14 +M a 110.15 +? b
111.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 111.2 +++ b/en/examples/rollback.status.out Tue Mar 06 21:44:56 2007 -0800 111.3 @@ -0,0 +1,9 @@ 111.4 +$ \textbf{hg status} 111.5 +? b 111.6 +$ \textbf{hg tip} 111.7 +changeset: 111.8 +tag: tip 111.9 +user: Bryan O'Sullivan <bos@serpentine.com> 111.10 + 111.11 +summary: Add file b 111.12 +
112.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 112.2 +++ b/en/examples/rollback.twice.out Tue Mar 06 21:44:56 2007 -0800 112.3 @@ -0,0 +1,4 @@ 112.4 +$ \textbf{hg rollback} 112.5 +rolling back last transaction 112.6 +$ \textbf{hg rollback} 112.7 +no rollback information available
113.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 113.2 +++ b/en/examples/template.simple.changelog.out Tue Mar 06 21:44:56 2007 -0800 113.3 @@ -0,0 +1,22 @@ 113.4 + 113.5 + 113.6 + 113.7 + 113.8 + 113.9 + 113.10 + 113.11 + 113.12 + 113.13 + 113.14 + 113.15 + 113.16 + 113.17 + 113.18 + 113.19 + 113.20 + 113.21 + 113.22 + 113.23 + 113.24 + 113.25 +
114.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 114.2 +++ b/en/examples/template.simple.combine.out Tue Mar 06 21:44:56 2007 -0800 114.3 @@ -0,0 +1,6 @@ 114.4 + 114.5 + 114.6 + 114.7 + 114.8 + 114.9 +
115.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 115.2 +++ b/en/examples/template.simple.compact.out Tue Mar 06 21:44:56 2007 -0800 115.3 @@ -0,0 +1,13 @@ 115.4 + 115.5 + 115.6 + 115.7 + 115.8 + 115.9 + 115.10 + 115.11 + 115.12 + 115.13 + 115.14 + 115.15 + 115.16 +
116.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 116.2 +++ b/en/examples/template.simple.datekeyword.out Tue Mar 06 21:44:56 2007 -0800 116.3 @@ -0,0 +1,4 @@ 116.4 + 116.5 + 116.6 + 116.7 +
117.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 117.2 +++ b/en/examples/template.simple.keywords.out Tue Mar 06 21:44:56 2007 -0800 117.3 @@ -0,0 +1,21 @@ 117.4 + 117.5 + 117.6 + 117.7 + 117.8 + 117.9 + 117.10 + 117.11 + 117.12 + 117.13 + 117.14 + 117.15 + 117.16 + 117.17 + 117.18 + 117.19 + 117.20 + 117.21 + 117.22 + 117.23 + 117.24 +
118.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 118.2 +++ b/en/examples/template.simple.manyfilters.out Tue Mar 06 21:44:56 2007 -0800 118.3 @@ -0,0 +1,62 @@ 118.4 + 118.5 + 118.6 + 118.7 + 118.8 + 118.9 + 118.10 + 118.11 + 118.12 + 118.13 + 118.14 + 118.15 + 118.16 + 118.17 + 118.18 + 118.19 + 118.20 + 118.21 + 118.22 + 118.23 + 118.24 + 118.25 + 118.26 + 118.27 + 118.28 + 118.29 + 118.30 + 118.31 + 118.32 + 118.33 + 118.34 + 118.35 + 118.36 + 118.37 + 118.38 + 118.39 + 118.40 + 118.41 + 118.42 + 118.43 + 118.44 + 118.45 + 118.46 + 118.47 + 118.48 + 118.49 + 118.50 + 118.51 + 118.52 + 118.53 + 118.54 + 118.55 + 118.56 + 118.57 + 118.58 + 118.59 + 118.60 + 118.61 + 118.62 + 118.63 + 118.64 + 118.65 +
119.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 119.2 +++ b/en/examples/template.simple.normal.out Tue Mar 06 21:44:56 2007 -0800 119.3 @@ -0,0 +1,7 @@ 119.4 + 119.5 + 119.6 + 119.7 + 119.8 + 119.9 + 119.10 +
120.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 120.2 +++ b/en/examples/template.simple.rev.out Tue Mar 06 21:44:56 2007 -0800 120.3 @@ -0,0 +1,3 @@ 120.4 + 120.5 + 120.6 +
121.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 121.2 +++ b/en/examples/template.simple.simplest.out Tue Mar 06 21:44:56 2007 -0800 121.3 @@ -0,0 +1,2 @@ 121.4 + 121.5 +
122.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 122.2 +++ b/en/examples/template.simple.simplesub.out Tue Mar 06 21:44:56 2007 -0800 122.3 @@ -0,0 +1,7 @@ 122.4 + 122.5 + 122.6 + 122.7 + 122.8 + 122.9 + 122.10 +
123.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 123.2 +++ b/en/examples/template.svnstyle.id.out Tue Mar 06 21:44:56 2007 -0800 123.3 @@ -0,0 +1,1 @@ 123.4 +$ \textbf{hg log -r0 --template '\{node\}'}
124.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 124.2 +++ b/en/examples/template.svnstyle.result.out Tue Mar 06 21:44:56 2007 -0800 124.3 @@ -0,0 +1,11 @@ 124.4 +$ \textbf{hg log -r1 --style svn.style} 124.5 +------------------------------------------------------------------------ 124.6 + 124.7 +r1 | bos 124.8 + 124.9 +added line to end of <<hello>> file. 124.10 + 124.11 +in addition, added a file with the helpful name (at least i hope that some 124.12 +might consider it so) of goodbye. 124.13 + 124.14 +------------------------------------------------------------------------
125.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 125.2 +++ b/en/examples/template.svnstyle.short.out Tue Mar 06 21:44:56 2007 -0800 125.3 @@ -0,0 +1,10 @@ 125.4 +$ \textbf{svn log -r9653} 125.5 +------------------------------------------------------------------------ 125.6 +r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 125.7 + 125.8 +On reporting a route error, also include the status for the error, 125.9 +rather than indicating a status of 0 when an error has occurred. 125.10 + 125.11 +Signed-off-by: Sean Hefty <sean.hefty@intel.com> 125.12 + 125.13 +------------------------------------------------------------------------
126.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 126.2 +++ b/en/examples/template.svnstyle.simplest.out Tue Mar 06 21:44:56 2007 -0800 126.3 @@ -0,0 +1,4 @@ 126.4 +$ \textbf{cat svn.style} 126.5 +changeset = "\{node|short\}\textbackslash{}n" 126.6 +$ \textbf{hg log -r1 --style svn.style} 126.7 +
127.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 127.2 +++ b/en/examples/template.svnstyle.style.out Tue Mar 06 21:44:56 2007 -0800 127.3 @@ -0,0 +1,3 @@ 127.4 +$ \textbf{cat svn.style} 127.5 +header = '------------------------------------------------------------------------\textbackslash{}n\textbackslash{}n' 127.6 +changeset = svn.template
128.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 128.2 +++ b/en/examples/template.svnstyle.syntax.error.out Tue Mar 06 21:44:56 2007 -0800 128.3 @@ -0,0 +1,2 @@ 128.4 +$ \textbf{hg log -r1 --style broken.style} 128.5 +abort: broken.style:1: parse error
129.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 129.2 +++ b/en/examples/template.svnstyle.syntax.input.out Tue Mar 06 21:44:56 2007 -0800 129.3 @@ -0,0 +1,2 @@ 129.4 +$ \textbf{cat broken.style} 129.5 +changeset =
130.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 130.2 +++ b/en/examples/template.svnstyle.template.out Tue Mar 06 21:44:56 2007 -0800 130.3 @@ -0,0 +1,6 @@ 130.4 +$ \textbf{cat svn.template} 130.5 +r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\}) 130.6 + 130.7 +\{desc|strip|fill76\} 130.8 + 130.9 +------------------------------------------------------------------------
131.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 131.2 +++ b/en/examples/tour-merge-conflict.commit.out Tue Mar 06 21:44:56 2007 -0800 131.3 @@ -0,0 +1,15 @@ 131.4 +$ \textbf{cat > letter.txt <<EOF} 131.5 +> \textbf{Greetings!} 131.6 +> \textbf{I am Bryan O'Sullivan, no relation of the former} 131.7 +> \textbf{Nigerian dictator Sani Abacha.} 131.8 +> \textbf{EOF} 131.9 +$ \textbf{hg commit -m 'Send me your money'} 131.10 +$ \textbf{hg tip} 131.11 +changeset: 131.12 +tag: tip 131.13 +parent: 131.14 +parent: 131.15 +user: Bryan O'Sullivan <bos@serpentine.com> 131.16 + 131.17 +summary: Send me your money 131.18 +
132.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 132.2 +++ b/en/examples/tour-merge-conflict.cousin.out Tue Mar 06 21:44:56 2007 -0800 132.3 @@ -0,0 +1,10 @@ 132.4 +$ \textbf{cd ..} 132.5 +$ \textbf{hg clone scam scam-cousin} 132.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 132.7 +$ \textbf{cd scam-cousin} 132.8 +$ \textbf{cat > letter.txt <<EOF} 132.9 +> \textbf{Greetings!} 132.10 +> \textbf{I am Shehu Musa Abacha, cousin to the former} 132.11 +> \textbf{Nigerian dictator Sani Abacha.} 132.12 +> \textbf{EOF} 132.13 +$ \textbf{hg commit -m '419 scam, with cousin'}
133.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 133.2 +++ b/en/examples/tour-merge-conflict.merge.out Tue Mar 06 21:44:56 2007 -0800 133.3 @@ -0,0 +1,17 @@ 133.4 +$ \textbf{export HGMERGE=merge} 133.5 +$ \textbf{hg merge} 133.6 +merging letter.txt 133.7 +merge: warning: conflicts during merge 133.8 +merging letter.txt failed! 133.9 +0 files updated, 0 files merged, 0 files removed, 1 files unresolved 133.10 +There are unresolved merges, you can redo the full merge using: 133.11 + hg update -C 1 133.12 + hg merge 2 133.13 +$ \textbf{cat letter.txt} 133.14 +Greetings! 133.15 + 133.16 +I am Shehu Musa Abacha, cousin to the former 133.17 +======= 133.18 +I am Alhaji Abba Abacha, son of the former 133.19 + 133.20 +Nigerian dictator Sani Abacha.
134.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 134.2 +++ b/en/examples/tour-merge-conflict.pull.out Tue Mar 06 21:44:56 2007 -0800 134.3 @@ -0,0 +1,13 @@ 134.4 +$ \textbf{cd ..} 134.5 +$ \textbf{hg clone scam-cousin scam-merge} 134.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 134.7 +$ \textbf{cd scam-merge} 134.8 +$ \textbf{hg pull -u ../scam-son} 134.9 +pulling from ../scam-son 134.10 +searching for changes 134.11 +adding changesets 134.12 +adding manifests 134.13 +adding file changes 134.14 +added 1 changesets with 1 changes to 1 files (+1 heads) 134.15 +not updating, since new heads added 134.16 +(run 'hg heads' to see heads, 'hg merge' to merge)
135.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 135.2 +++ b/en/examples/tour-merge-conflict.son.out Tue Mar 06 21:44:56 2007 -0800 135.3 @@ -0,0 +1,10 @@ 135.4 +$ \textbf{cd ..} 135.5 +$ \textbf{hg clone scam scam-son} 135.6 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 135.7 +$ \textbf{cd scam-son} 135.8 +$ \textbf{cat > letter.txt <<EOF} 135.9 +> \textbf{Greetings!} 135.10 +> \textbf{I am Alhaji Abba Abacha, son of the former} 135.11 +> \textbf{Nigerian dictator Sani Abacha.} 135.12 +> \textbf{EOF} 135.13 +$ \textbf{hg commit -m '419 scam, with son'}
136.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 136.2 +++ b/en/examples/tour-merge-conflict.wife.out Tue Mar 06 21:44:56 2007 -0800 136.3 @@ -0,0 +1,7 @@ 136.4 +$ \textbf{cat > letter.txt <<EOF} 136.5 +> \textbf{Greetings!} 136.6 +> \textbf{I am Mariam Abacha, the wife of former} 136.7 +> \textbf{Nigerian dictator Sani Abacha.} 136.8 +> \textbf{EOF} 136.9 +$ \textbf{hg add letter.txt} 136.10 +$ \textbf{hg commit -m '419 scam, first draft'}
137.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 137.2 +++ b/en/examples/tour.clone-pull.out Tue Mar 06 21:44:56 2007 -0800 137.3 @@ -0,0 +1,3 @@ 137.4 +$ \textbf{cd ..} 137.5 +$ \textbf{hg clone hello hello-pull} 137.6 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
138.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 138.2 +++ b/en/examples/tour.clone-push.out Tue Mar 06 21:44:56 2007 -0800 138.3 @@ -0,0 +1,3 @@ 138.4 +$ \textbf{cd ..} 138.5 +$ \textbf{hg clone hello hello-push} 138.6 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
139.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 139.2 +++ b/en/examples/tour.clone.out Tue Mar 06 21:44:56 2007 -0800 139.3 @@ -0,0 +1,8 @@ 139.4 +$ \textbf{hg clone http://hg.serpentine.com/tutorial/hello} 139.5 +destination directory: hello 139.6 +requesting all changes 139.7 +adding changesets 139.8 +adding manifests 139.9 +adding file changes 139.10 +added 5 changesets with 5 changes to 2 files 139.11 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
140.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 140.2 +++ b/en/examples/tour.commit-no-user.out Tue Mar 06 21:44:56 2007 -0800 140.3 @@ -0,0 +1,1 @@ 140.4 +$ \textbf{hg commit}
141.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 141.2 +++ b/en/examples/tour.commit.out Tue Mar 06 21:44:56 2007 -0800 141.3 @@ -0,0 +1,2 @@ 141.4 +$ \textbf{hg commit} 141.5 +nothing changed
142.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 142.2 +++ b/en/examples/tour.diff.out Tue Mar 06 21:44:56 2007 -0800 142.3 @@ -0,0 +1,11 @@ 142.4 +$ \textbf{hg diff} 142.5 +diff -r hello.c 142.6 + 142.7 + 142.8 +@@ -8,5 +8,6 @@ int main(int argc, char **argv) 142.9 + int main(int argc, char **argv) 142.10 + \{ 142.11 + printf("hello, world!\textbackslash{}"); 142.12 ++ printf("hello again!\textbackslash{}n"); 142.13 + return 0; 142.14 + \}
143.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 143.2 +++ b/en/examples/tour.help.out Tue Mar 06 21:44:56 2007 -0800 143.3 @@ -0,0 +1,18 @@ 143.4 +$ \textbf{hg help init} 143.5 +hg init [-e CMD] [--remotecmd CMD] [DEST] 143.6 + 143.7 +create a new repository in the given directory 143.8 + 143.9 + Initialize a new repository in the given directory. If the given 143.10 + directory does not exist, it is created. 143.11 + 143.12 + If no directory is given, the current directory is used. 143.13 + 143.14 + It is possible to specify an ssh:// URL as the destination. 143.15 + Look at the help text for the pull command for important details 143.16 + about ssh:// URLs. 143.17 + 143.18 +options: 143.19 + 143.20 + -e --ssh specify ssh command to use 143.21 + --remotecmd specify hg command to run on the remote side
144.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 144.2 +++ b/en/examples/tour.incoming.out Tue Mar 06 21:44:56 2007 -0800 144.3 @@ -0,0 +1,9 @@ 144.4 +$ \textbf{cd hello-pull} 144.5 +$ \textbf{hg incoming ../my-hello} 144.6 +searching for changes 144.7 +changeset: 144.8 +tag: tip 144.9 +user: Bryan O'Sullivan <bos@serpentine.com> 144.10 + 144.11 +summary: Added an extra line of output 144.12 +
145.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 145.2 +++ b/en/examples/tour.log-r.out Tue Mar 06 21:44:56 2007 -0800 145.3 @@ -0,0 +1,24 @@ 145.4 +$ \textbf{hg log -r 3} 145.5 +changeset: 145.6 +user: Bryan O'Sullivan <bos@serpentine.com> 145.7 + 145.8 +summary: Get make to generate the final binary from a .o file. 145.9 + 145.10 +$ \textbf{hg log -r } 145.11 +changeset: 145.12 +user: Bryan O'Sullivan <bos@serpentine.com> 145.13 + 145.14 +summary: Get make to generate the final binary from a .o file. 145.15 + 145.16 +$ \textbf{hg log -r 1 -r 4} 145.17 +changeset: 145.18 +user: mpm@selenic.com 145.19 + 145.20 +summary: Create a makefile 145.21 + 145.22 +changeset: 145.23 +tag: tip 145.24 +user: Bryan O'Sullivan <bos@serpentine.com> 145.25 + 145.26 +summary: Trim comments. 145.27 +
146.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 146.2 +++ b/en/examples/tour.log-v.out Tue Mar 06 21:44:56 2007 -0800 146.3 @@ -0,0 +1,9 @@ 146.4 +$ \textbf{hg log -v -r 3} 146.5 +changeset: 146.6 +user: Bryan O'Sullivan <bos@serpentine.com> 146.7 + 146.8 +files: Makefile 146.9 +description: 146.10 +Get make to generate the final binary from a .o file. 146.11 + 146.12 +
147.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 147.2 +++ b/en/examples/tour.log-vp.out Tue Mar 06 21:44:56 2007 -0800 147.3 @@ -0,0 +1,21 @@ 147.4 +$ \textbf{hg log -v -p -r 2} 147.5 +changeset: 147.6 +user: Bryan O'Sullivan <bos@serpentine.com> 147.7 + 147.8 +files: hello.c 147.9 +description: 147.10 +Introduce a typo into hello.c. 147.11 + 147.12 + 147.13 +diff -r -r hello.c 147.14 + 147.15 + 147.16 +@@ -11,6 +11,6 @@ 147.17 + 147.18 + int main(int argc, char **argv) 147.19 + \{ 147.20 +- printf("hello, world!\textbackslash{}n"); 147.21 ++ printf("hello, world!\textbackslash{}"); 147.22 + return 0; 147.23 + \} 147.24 +
148.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 148.2 +++ b/en/examples/tour.log.out Tue Mar 06 21:44:56 2007 -0800 148.3 @@ -0,0 +1,27 @@ 148.4 +$ \textbf{hg log} 148.5 +changeset: 148.6 +tag: tip 148.7 +user: Bryan O'Sullivan <bos@serpentine.com> 148.8 + 148.9 +summary: Trim comments. 148.10 + 148.11 +changeset: 148.12 +user: Bryan O'Sullivan <bos@serpentine.com> 148.13 + 148.14 +summary: Get make to generate the final binary from a .o file. 148.15 + 148.16 +changeset: 148.17 +user: Bryan O'Sullivan <bos@serpentine.com> 148.18 + 148.19 +summary: Introduce a typo into hello.c. 148.20 + 148.21 +changeset: 148.22 +user: mpm@selenic.com 148.23 + 148.24 +summary: Create a makefile 148.25 + 148.26 +changeset: 148.27 +user: mpm@selenic.com 148.28 + 148.29 +summary: Create a standard "hello, world" program 148.30 +
149.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 149.2 +++ b/en/examples/tour.log.range.out Tue Mar 06 21:44:56 2007 -0800 149.3 @@ -0,0 +1,17 @@ 149.4 +$ \textbf{hg log -r 2:4} 149.5 +changeset: 149.6 +user: Bryan O'Sullivan <bos@serpentine.com> 149.7 + 149.8 +summary: Introduce a typo into hello.c. 149.9 + 149.10 +changeset: 149.11 +user: Bryan O'Sullivan <bos@serpentine.com> 149.12 + 149.13 +summary: Get make to generate the final binary from a .o file. 149.14 + 149.15 +changeset: 149.16 +tag: tip 149.17 +user: Bryan O'Sullivan <bos@serpentine.com> 149.18 + 149.19 +summary: Trim comments. 149.20 +
150.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 150.2 +++ b/en/examples/tour.ls-a.out Tue Mar 06 21:44:56 2007 -0800 150.3 @@ -0,0 +1,3 @@ 150.4 +$ \textbf{cd hello} 150.5 +$ \textbf{ls -a} 150.6 +. .. .hg Makefile hello.c
151.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 151.2 +++ b/en/examples/tour.ls.out Tue Mar 06 21:44:56 2007 -0800 151.3 @@ -0,0 +1,5 @@ 151.4 +$ \textbf{ls -l} 151.5 +total 4 151.6 + 151.7 +$ \textbf{ls hello} 151.8 +Makefile hello.c
152.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 152.2 +++ b/en/examples/tour.merge.cat.out Tue Mar 06 21:44:56 2007 -0800 152.3 @@ -0,0 +1,28 @@ 152.4 +$ \textbf{cat hello.c} 152.5 +/* 152.6 + * Placed in the public domain by Bryan O'Sullivan. This program is 152.7 + * not covered by patents in the United States or other countries. 152.8 + */ 152.9 + 152.10 +#include <stdio.h> 152.11 + 152.12 +int main(int argc, char **argv) 152.13 +\{ 152.14 + printf("once more, hello.\textbackslash{}n"); 152.15 + printf("hello, world!\textbackslash{}"); 152.16 + return 0; 152.17 +\} 152.18 +$ \textbf{cat ../my-hello/hello.c} 152.19 +/* 152.20 + * Placed in the public domain by Bryan O'Sullivan. This program is 152.21 + * not covered by patents in the United States or other countries. 152.22 + */ 152.23 + 152.24 +#include <stdio.h> 152.25 + 152.26 +int main(int argc, char **argv) 152.27 +\{ 152.28 + printf("hello, world!\textbackslash{}"); 152.29 + printf("hello again!\textbackslash{}n"); 152.30 + return 0; 152.31 +\}
153.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 153.2 +++ b/en/examples/tour.merge.clone.out Tue Mar 06 21:44:56 2007 -0800 153.3 @@ -0,0 +1,6 @@ 153.4 +$ \textbf{cd ..} 153.5 +$ \textbf{hg clone hello my-new-hello} 153.6 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 153.7 +$ \textbf{cd my-new-hello} 153.8 +$ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c} 153.9 +$ \textbf{hg commit -m 'A new hello for a new day.'}
154.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 154.2 +++ b/en/examples/tour.merge.commit.out Tue Mar 06 21:44:56 2007 -0800 154.3 @@ -0,0 +1,1 @@ 154.4 +$ \textbf{hg commit -m 'Merged changes'}
155.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 155.2 +++ b/en/examples/tour.merge.heads.out Tue Mar 06 21:44:56 2007 -0800 155.3 @@ -0,0 +1,13 @@ 155.4 +$ \textbf{hg heads} 155.5 +changeset: 155.6 +tag: tip 155.7 +parent: 155.8 +user: Bryan O'Sullivan <bos@serpentine.com> 155.9 + 155.10 +summary: Added an extra line of output 155.11 + 155.12 +changeset: 155.13 +user: Bryan O'Sullivan <bos@serpentine.com> 155.14 + 155.15 +summary: A new hello for a new day. 155.16 +
156.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 156.2 +++ b/en/examples/tour.merge.merge.out Tue Mar 06 21:44:56 2007 -0800 156.3 @@ -0,0 +1,4 @@ 156.4 +$ \textbf{hg merge} 156.5 +merging hello.c 156.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 156.7 +(branch merge, don't forget to commit)
157.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 157.2 +++ b/en/examples/tour.merge.parents.out Tue Mar 06 21:44:56 2007 -0800 157.3 @@ -0,0 +1,28 @@ 157.4 +$ \textbf{hg parents} 157.5 +changeset: 157.6 +user: Bryan O'Sullivan <bos@serpentine.com> 157.7 + 157.8 +summary: A new hello for a new day. 157.9 + 157.10 +changeset: 157.11 +tag: tip 157.12 +parent: 157.13 +user: Bryan O'Sullivan <bos@serpentine.com> 157.14 + 157.15 +summary: Added an extra line of output 157.16 + 157.17 +$ \textbf{cat hello.c} 157.18 +/* 157.19 + * Placed in the public domain by Bryan O'Sullivan. This program is 157.20 + * not covered by patents in the United States or other countries. 157.21 + */ 157.22 + 157.23 +#include <stdio.h> 157.24 + 157.25 +int main(int argc, char **argv) 157.26 +\{ 157.27 + printf("once more, hello.\textbackslash{}n"); 157.28 + printf("hello, world!\textbackslash{}"); 157.29 + printf("hello again!\textbackslash{}n"); 157.30 + return 0; 157.31 +\}
158.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 158.2 +++ b/en/examples/tour.merge.pull.out Tue Mar 06 21:44:56 2007 -0800 158.3 @@ -0,0 +1,8 @@ 158.4 +$ \textbf{hg pull ../my-hello} 158.5 +pulling from ../my-hello 158.6 +searching for changes 158.7 +adding changesets 158.8 +adding manifests 158.9 +adding file changes 158.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 158.11 +(run 'hg heads' to see heads, 'hg merge' to merge)
159.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 159.2 +++ b/en/examples/tour.merge.tip.out Tue Mar 06 21:44:56 2007 -0800 159.3 @@ -0,0 +1,9 @@ 159.4 +$ \textbf{hg tip} 159.5 +changeset: 159.6 +tag: tip 159.7 +parent: 159.8 +parent: 159.9 +user: Bryan O'Sullivan <bos@serpentine.com> 159.10 + 159.11 +summary: Merged changes 159.12 +
160.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 160.2 +++ b/en/examples/tour.merge.update.out Tue Mar 06 21:44:56 2007 -0800 160.3 @@ -0,0 +1,2 @@ 160.4 +$ \textbf{hg update} 160.5 +abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
161.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 161.2 +++ b/en/examples/tour.older.out Tue Mar 06 21:44:56 2007 -0800 161.3 @@ -0,0 +1,10 @@ 161.4 +$ \textbf{hg update 2} 161.5 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 161.6 +$ \textbf{hg parents} 161.7 +changeset: 161.8 +user: Bryan O'Sullivan <bos@serpentine.com> 161.9 + 161.10 +summary: Introduce a typo into hello.c. 161.11 + 161.12 +$ \textbf{hg update} 161.13 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved
162.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 162.2 +++ b/en/examples/tour.outgoing.net.out Tue Mar 06 21:44:56 2007 -0800 162.3 @@ -0,0 +1,8 @@ 162.4 +$ \textbf{hg outgoing http://hg.serpentine.com/tutorial/hello} 162.5 +searching for changes 162.6 +changeset: 162.7 +tag: tip 162.8 +user: Bryan O'Sullivan <bos@serpentine.com> 162.9 + 162.10 +summary: Added an extra line of output 162.11 +
163.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 163.2 +++ b/en/examples/tour.outgoing.out Tue Mar 06 21:44:56 2007 -0800 163.3 @@ -0,0 +1,9 @@ 163.4 +$ \textbf{cd my-hello} 163.5 +$ \textbf{hg outgoing ../hello-push} 163.6 +searching for changes 163.7 +changeset: 163.8 +tag: tip 163.9 +user: Bryan O'Sullivan <bos@serpentine.com> 163.10 + 163.11 +summary: Added an extra line of output 163.12 +
164.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 164.2 +++ b/en/examples/tour.parents.out Tue Mar 06 21:44:56 2007 -0800 164.3 @@ -0,0 +1,7 @@ 164.4 +$ \textbf{hg parents} 164.5 +changeset: 164.6 +tag: tip 164.7 +user: Bryan O'Sullivan <bos@serpentine.com> 164.8 + 164.9 +summary: Added an extra line of output 164.10 +
165.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 165.2 +++ b/en/examples/tour.pull.out Tue Mar 06 21:44:56 2007 -0800 165.3 @@ -0,0 +1,22 @@ 165.4 +$ \textbf{hg tip} 165.5 +changeset: 165.6 +tag: tip 165.7 +user: Bryan O'Sullivan <bos@serpentine.com> 165.8 + 165.9 +summary: Trim comments. 165.10 + 165.11 +$ \textbf{hg pull ../my-hello} 165.12 +pulling from ../my-hello 165.13 +searching for changes 165.14 +adding changesets 165.15 +adding manifests 165.16 +adding file changes 165.17 +added 1 changesets with 1 changes to 1 files 165.18 +(run 'hg update' to get a working copy) 165.19 +$ \textbf{hg tip} 165.20 +changeset: 165.21 +tag: tip 165.22 +user: Bryan O'Sullivan <bos@serpentine.com> 165.23 + 165.24 +summary: Added an extra line of output 165.25 +
166.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 166.2 +++ b/en/examples/tour.push.net.out Tue Mar 06 21:44:56 2007 -0800 166.3 @@ -0,0 +1,4 @@ 166.4 +$ \textbf{hg push http://hg.serpentine.com/tutorial/hello} 166.5 +pushing to http://hg.serpentine.com/tutorial/hello 166.6 +searching for changes 166.7 +ssl required
167.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 167.2 +++ b/en/examples/tour.push.nothing.out Tue Mar 06 21:44:56 2007 -0800 167.3 @@ -0,0 +1,4 @@ 167.4 +$ \textbf{hg push ../hello-push} 167.5 +pushing to ../hello-push 167.6 +searching for changes 167.7 +no changes found
168.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 168.2 +++ b/en/examples/tour.push.out Tue Mar 06 21:44:56 2007 -0800 168.3 @@ -0,0 +1,7 @@ 168.4 +$ \textbf{hg push ../hello-push} 168.5 +pushing to ../hello-push 168.6 +searching for changes 168.7 +adding changesets 168.8 +adding manifests 168.9 +adding file changes 168.10 +added 1 changesets with 1 changes to 1 files
169.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 169.2 +++ b/en/examples/tour.reclone.out Tue Mar 06 21:44:56 2007 -0800 169.3 @@ -0,0 +1,4 @@ 169.4 +$ \textbf{cd ..} 169.5 +$ \textbf{hg clone hello my-hello} 169.6 +2 files updated, 0 files merged, 0 files removed, 0 files unresolved 169.7 +$ \textbf{cd my-hello}
170.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 170.2 +++ b/en/examples/tour.sed.out Tue Mar 06 21:44:56 2007 -0800 170.3 @@ -0,0 +1,1 @@ 170.4 +$ \textbf{sed -i '/printf/a\textbackslash{}\textbackslash{}tprintf("hello again!\textbackslash{}\textbackslash{}n");' hello.c}
171.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 171.2 +++ b/en/examples/tour.status.out Tue Mar 06 21:44:56 2007 -0800 171.3 @@ -0,0 +1,4 @@ 171.4 +$ \textbf{ls} 171.5 +Makefile hello.c 171.6 +$ \textbf{hg status} 171.7 +M hello.c
172.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 172.2 +++ b/en/examples/tour.tip.out Tue Mar 06 21:44:56 2007 -0800 172.3 @@ -0,0 +1,21 @@ 172.4 +$ \textbf{hg tip -vp} 172.5 +changeset: 172.6 +tag: tip 172.7 +user: Bryan O'Sullivan <bos@serpentine.com> 172.8 + 172.9 +files: hello.c 172.10 +description: 172.11 +Added an extra line of output 172.12 + 172.13 + 172.14 +diff -r -r hello.c 172.15 + 172.16 + 172.17 +@@ -8,5 +8,6 @@ int main(int argc, char **argv) 172.18 + int main(int argc, char **argv) 172.19 + \{ 172.20 + printf("hello, world!\textbackslash{}"); 172.21 ++ printf("hello again!\textbackslash{}n"); 172.22 + return 0; 172.23 + \} 172.24 +
173.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 173.2 +++ b/en/examples/tour.update.out Tue Mar 06 21:44:56 2007 -0800 173.3 @@ -0,0 +1,7 @@ 173.4 +$ \textbf{grep printf hello.c} 173.5 + printf("hello, world!\textbackslash{}"); 173.6 +$ \textbf{hg update tip} 173.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 173.8 +$ \textbf{grep printf hello.c} 173.9 + printf("hello, world!\textbackslash{}"); 173.10 + printf("hello again!\textbackslash{}n");
174.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 174.2 +++ b/en/examples/tour.version.out Tue Mar 06 21:44:56 2007 -0800 174.3 @@ -0,0 +1,6 @@ 174.4 +$ \textbf{hg version} 174.5 +Mercurial Distributed SCM (version ) 174.6 + 174.7 +Copyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com> 174.8 +This is free software; see the source for copying conditions. There is NO 174.9 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.