hgbook
changeset 334:83790457e85b
modifications to generate the examples for the book
line diff
1.1 --- a/en/examples/bisect.help.out Sat Oct 18 07:48:21 2008 -0500 1.2 +++ b/en/examples/bisect.help.out Sat Oct 18 12:07:16 2008 -0500 1.3 @@ -19,3 +19,6 @@ 1.4 1.5 1.6 1.7 + 1.8 + 1.9 +
2.1 --- a/en/examples/bisect.search.bad-init.out Sat Oct 18 07:48:21 2008 -0500 2.2 +++ b/en/examples/bisect.search.bad-init.out Sat Oct 18 12:07:16 2008 -0500 2.3 @@ -1,22 +1,2 @@ 2.4 2.5 2.6 - 2.7 - 2.8 - 2.9 - 2.10 - 2.11 - 2.12 - 2.13 - 2.14 - 2.15 - 2.16 - 2.17 - 2.18 - 2.19 - 2.20 - 2.21 - 2.22 - 2.23 - 2.24 - 2.25 -
3.1 --- a/en/examples/bisect.search.good-init.out Sat Oct 18 07:48:21 2008 -0500 3.2 +++ b/en/examples/bisect.search.good-init.out Sat Oct 18 12:07:16 2008 -0500 3.3 @@ -2,21 +2,3 @@ 3.4 3.5 3.6 3.7 - 3.8 - 3.9 - 3.10 - 3.11 - 3.12 - 3.13 - 3.14 - 3.15 - 3.16 - 3.17 - 3.18 - 3.19 - 3.20 - 3.21 - 3.22 - 3.23 - 3.24 -
4.1 --- a/en/examples/bisect.search.init.out Sat Oct 18 07:48:21 2008 -0500 4.2 +++ b/en/examples/bisect.search.init.out Sat Oct 18 12:07:16 2008 -0500 4.3 @@ -20,3 +20,6 @@ 4.4 4.5 4.6 4.7 + 4.8 + 4.9 +
5.1 --- a/en/examples/bisect.search.reset.out Sat Oct 18 07:48:21 2008 -0500 5.2 +++ b/en/examples/bisect.search.reset.out Sat Oct 18 12:07:16 2008 -0500 5.3 @@ -1,22 +1,2 @@ 5.4 5.5 5.6 - 5.7 - 5.8 - 5.9 - 5.10 - 5.11 - 5.12 - 5.13 - 5.14 - 5.15 - 5.16 - 5.17 - 5.18 - 5.19 - 5.20 - 5.21 - 5.22 - 5.23 - 5.24 - 5.25 -
6.1 --- a/en/examples/bisect.search.rest.out Sat Oct 18 07:48:21 2008 -0500 6.2 +++ b/en/examples/bisect.search.rest.out Sat Oct 18 12:07:16 2008 -0500 6.3 @@ -17,53 +17,3 @@ 6.4 6.5 6.6 6.7 - 6.8 - 6.9 - 6.10 - 6.11 - 6.12 - 6.13 - 6.14 - 6.15 - 6.16 - 6.17 - 6.18 - 6.19 - 6.20 - 6.21 - 6.22 - 6.23 - 6.24 - 6.25 - 6.26 - 6.27 - 6.28 - 6.29 - 6.30 - 6.31 - 6.32 - 6.33 - 6.34 - 6.35 - 6.36 - 6.37 - 6.38 - 6.39 - 6.40 - 6.41 - 6.42 - 6.43 - 6.44 - 6.45 - 6.46 - 6.47 - 6.48 - 6.49 - 6.50 - 6.51 - 6.52 - 6.53 - 6.54 - 6.55 - 6.56 -
7.1 --- a/en/examples/bisect.search.step1.out Sat Oct 18 07:48:21 2008 -0500 7.2 +++ b/en/examples/bisect.search.step1.out Sat Oct 18 12:07:16 2008 -0500 7.3 @@ -10,21 +10,3 @@ 7.4 7.5 7.6 7.7 - 7.8 - 7.9 - 7.10 - 7.11 - 7.12 - 7.13 - 7.14 - 7.15 - 7.16 - 7.17 - 7.18 - 7.19 - 7.20 - 7.21 - 7.22 - 7.23 - 7.24 -
8.1 --- a/en/examples/bisect.search.step2.out Sat Oct 18 07:48:21 2008 -0500 8.2 +++ b/en/examples/bisect.search.step2.out Sat Oct 18 12:07:16 2008 -0500 8.3 @@ -3,21 +3,3 @@ 8.4 8.5 8.6 8.7 - 8.8 - 8.9 - 8.10 - 8.11 - 8.12 - 8.13 - 8.14 - 8.15 - 8.16 - 8.17 - 8.18 - 8.19 - 8.20 - 8.21 - 8.22 - 8.23 - 8.24 -
9.1 --- a/en/examples/daily.copy.merge.out Sat Oct 18 07:48:21 2008 -0500 9.2 +++ b/en/examples/daily.copy.merge.out Sat Oct 18 12:07:16 2008 -0500 9.3 @@ -7,7 +7,7 @@ 9.4 added 1 changesets with 1 changes to 1 files (+1 heads) 9.5 (run 'hg heads' to see heads, 'hg merge' to merge) 9.6 $ \textbf{hg merge} 9.7 -merging file and new-file to new-file 9.8 +merging file and new-file 9.9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 9.10 (branch merge, don't forget to commit) 9.11 $ \textbf{cat new-file}
10.1 --- a/en/examples/tour-merge-conflict.commit.out Sat Oct 18 07:48:21 2008 -0500 10.2 +++ b/en/examples/tour-merge-conflict.commit.out Sat Oct 18 12:07:16 2008 -0500 10.3 @@ -4,6 +4,29 @@ 10.4 > \textbf{Nigerian dictator Sani Abacha.} 10.5 > \textbf{EOF} 10.6 $ \textbf{hg resolve -m letter.txt} 10.7 +hg: unknown command 'resolve' 10.8 +Mercurial Distributed SCM 10.9 + 10.10 +basic commands: 10.11 + 10.12 + add add the specified files on the next commit 10.13 + annotate show changeset information per file line 10.14 + clone make a copy of an existing repository 10.15 + commit commit the specified files or all outstanding changes 10.16 + diff diff repository (or selected files) 10.17 + export dump the header and diffs for one or more changesets 10.18 + init create a new repository in the given directory 10.19 + log show revision history of entire repository or files 10.20 + merge merge working directory with another revision 10.21 + parents show the parents of the working dir or revision 10.22 + pull pull changes from the specified source 10.23 + push push changes to the specified destination 10.24 + remove remove the specified files on the next commit 10.25 + serve export the repository via HTTP 10.26 + status show changed files in the working directory 10.27 + update update working directory 10.28 + 10.29 +use "hg help" for the full list of commands or "hg -v" for details 10.30 $ \textbf{hg commit -m 'Send me your money'} 10.31 $ \textbf{hg tip} 10.32 changeset:
11.1 --- a/en/examples/tour-merge-conflict.merge.out Sat Oct 18 07:48:21 2008 -0500 11.2 +++ b/en/examples/tour-merge-conflict.merge.out Sat Oct 18 12:07:16 2008 -0500 11.3 @@ -4,7 +4,9 @@ 11.4 merge: warning: conflicts during merge 11.5 merging letter.txt failed! 11.6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 11.7 -use 'hg resolve' to retry unresolved file merges 11.8 +There are unresolved merges, you can redo the full merge using: 11.9 + hg update -C 1 11.10 + hg merge 2 11.11 $ \textbf{cat letter.txt} 11.12 Greetings! 11.13
12.1 --- a/en/examples/tour.help.out Sat Oct 18 07:48:21 2008 -0500 12.2 +++ b/en/examples/tour.help.out Sat Oct 18 12:07:16 2008 -0500 12.3 @@ -3,7 +3,7 @@ 12.4 12.5 create a new repository in the given directory 12.6 12.7 - Initialize a new repository in the given directory. If the given 12.8 + Initialize a new repository in the given directory. If the given 12.9 directory does not exist, it is created. 12.10 12.11 If no directory is given, the current directory is used.
13.1 --- a/en/examples/tour.ls.out Sat Oct 18 07:48:21 2008 -0500 13.2 +++ b/en/examples/tour.ls.out Sat Oct 18 12:07:16 2008 -0500 13.3 @@ -1,5 +1,5 @@ 13.4 $ \textbf{ls -l} 13.5 -total 4 13.6 + 13.7 13.8 $ \textbf{ls hello} 13.9 Makefile hello.c
14.1 --- a/en/examples/tour.version.out Sat Oct 18 07:48:21 2008 -0500 14.2 +++ b/en/examples/tour.version.out Sat Oct 18 12:07:16 2008 -0500 14.3 @@ -1,5 +1,5 @@ 14.4 $ \textbf{hg version} 14.5 -Mercurial Distributed SCM (version ) 14.6 +Mercurial Distributed SCM (version 1.0) 14.7 14.8 Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others 14.9 This is free software; see the source for copying conditions. There is NO