Mercurial > hgbook
changeset 433:83790457e85b
modifications to generate the examples for the book
| author | jerojasro@localhost |
|---|---|
| date | Sat, 18 Oct 2008 12:07:16 -0500 |
| parents | 04c08ad7e92e |
| children | 7f0af73f53ab |
| files | en/examples/bisect.help.out en/examples/bisect.search.bad-init.out en/examples/bisect.search.good-init.out en/examples/bisect.search.init.out en/examples/bisect.search.reset.out en/examples/bisect.search.rest.out en/examples/bisect.search.step1.out en/examples/bisect.search.step2.out en/examples/daily.copy.merge.out en/examples/tour-merge-conflict.commit.out en/examples/tour-merge-conflict.merge.out en/examples/tour.help.out en/examples/tour.ls.out en/examples/tour.version.out |
| diffstat | 14 files changed, 36 insertions(+), 149 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/bisect.help.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.help.out Sat Oct 18 12:07:16 2008 -0500 @@ -19,3 +19,6 @@ + + +
--- a/en/examples/bisect.search.bad-init.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.bad-init.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,22 +1,2 @@ - - - - - - - - - - - - - - - - - - - -
--- a/en/examples/bisect.search.good-init.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.good-init.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,22 +1,4 @@ - - - - - - - - - - - - - - - - - -
--- a/en/examples/bisect.search.init.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.init.out Sat Oct 18 12:07:16 2008 -0500 @@ -20,3 +20,6 @@ + + +
--- a/en/examples/bisect.search.reset.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.reset.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,22 +1,2 @@ - - - - - - - - - - - - - - - - - - - -
--- a/en/examples/bisect.search.rest.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.rest.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,19 +1,3 @@ - - - - - - - - - - - - - - - - @@ -33,37 +17,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/en/examples/bisect.search.step1.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.step1.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,6 +1,3 @@ - - - @@ -13,18 +10,3 @@ - - - - - - - - - - - - - - -
--- a/en/examples/bisect.search.step2.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/bisect.search.step2.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,23 +1,5 @@ - - - - - - - - - - - - - - - - - -
--- a/en/examples/daily.copy.merge.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/daily.copy.merge.out Sat Oct 18 12:07:16 2008 -0500 @@ -7,7 +7,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ \textbf{hg merge} -merging file and new-file to new-file +merging file and new-file 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{cat new-file}
--- a/en/examples/tour-merge-conflict.commit.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/tour-merge-conflict.commit.out Sat Oct 18 12:07:16 2008 -0500 @@ -4,6 +4,29 @@ > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg resolve -m letter.txt} +hg: unknown command 'resolve' +Mercurial Distributed SCM + +basic commands: + + add add the specified files on the next commit + annotate show changeset information per file line + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + parents show the parents of the working dir or revision + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve export the repository via HTTP + status show changed files in the working directory + update update working directory + +use "hg help" for the full list of commands or "hg -v" for details $ \textbf{hg commit -m 'Send me your money'} $ \textbf{hg tip} changeset:
--- a/en/examples/tour-merge-conflict.merge.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/tour-merge-conflict.merge.out Sat Oct 18 12:07:16 2008 -0500 @@ -4,7 +4,9 @@ merge: warning: conflicts during merge merging letter.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges +There are unresolved merges, you can redo the full merge using: + hg update -C 1 + hg merge 2 $ \textbf{cat letter.txt} Greetings!
--- a/en/examples/tour.help.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/tour.help.out Sat Oct 18 12:07:16 2008 -0500 @@ -3,7 +3,7 @@ create a new repository in the given directory - Initialize a new repository in the given directory. If the given + Initialize a new repository in the given directory. If the given directory does not exist, it is created. If no directory is given, the current directory is used.
--- a/en/examples/tour.ls.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/tour.ls.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,5 +1,5 @@ $ \textbf{ls -l} -total 4 + $ \textbf{ls hello} Makefile hello.c
--- a/en/examples/tour.version.out Sat Oct 18 07:48:21 2008 -0500 +++ b/en/examples/tour.version.out Sat Oct 18 12:07:16 2008 -0500 @@ -1,5 +1,5 @@ $ \textbf{hg version} -Mercurial Distributed SCM (version ) +Mercurial Distributed SCM (version 1.0) Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others This is free software; see the source for copying conditions. There is NO