Mercurial > hgbook
changeset 405:1b52bda675d0
Fix sample output for 'tour' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 22:08:24 +0200 |
| parents | ef34f7bec749 |
| children | fb5c0d56d7f1 |
| files | en/examples/tour.clone-pull.out en/examples/tour.clone-push.out en/examples/tour.clone.out en/examples/tour.diff.out en/examples/tour.help.out en/examples/tour.merge.clone.out en/examples/tour.merge.update.out en/examples/tour.reclone.out en/examples/tour.tip.out en/examples/tour.version.out |
| diffstat | 10 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/en/examples/tour.clone-pull.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.clone-pull.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,3 +1,4 @@ $ \textbf{cd ..} $ \textbf{hg clone hello hello-pull} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.clone-push.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.clone-push.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,3 +1,4 @@ $ \textbf{cd ..} $ \textbf{hg clone hello hello-push} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.clone.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.clone.out Wed Aug 20 22:08:24 2008 +0200 @@ -5,4 +5,5 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/tour.diff.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.diff.out Wed Aug 20 22:08:24 2008 +0200 @@ -2,7 +2,7 @@ diff -r hello.c -@@ -8,5 +8,6 @@ int main(int argc, char **argv) +@@ -8,5 +8,6 @@ int main(int argc, char **argv) \{ printf("hello, world!\textbackslash{}");
--- a/en/examples/tour.help.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.help.out Wed Aug 20 22:08:24 2008 +0200 @@ -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.merge.clone.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.merge.clone.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,5 +1,6 @@ $ \textbf{cd ..} $ \textbf{hg clone hello my-new-hello} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd my-new-hello} $ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
--- a/en/examples/tour.merge.update.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.merge.update.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,2 +1,2 @@ $ \textbf{hg update} -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes +abort: crosses branches (use 'hg merge' or 'hg update -C')
--- a/en/examples/tour.reclone.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.reclone.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,4 +1,5 @@ $ \textbf{cd ..} $ \textbf{hg clone hello my-hello} +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd my-hello}
--- a/en/examples/tour.tip.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.tip.out Wed Aug 20 22:08:24 2008 +0200 @@ -11,7 +11,7 @@ diff -r -r hello.c -@@ -8,5 +8,6 @@ int main(int argc, char **argv) +@@ -8,5 +8,6 @@ int main(int argc, char **argv) \{ printf("hello, world!\textbackslash{}");
--- a/en/examples/tour.version.out Wed Aug 20 22:04:41 2008 +0200 +++ b/en/examples/tour.version.out Wed Aug 20 22:08:24 2008 +0200 @@ -1,6 +1,6 @@ $ \textbf{hg version} Mercurial Distributed SCM (version ) -Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others +Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.