hgbook

changeset 306:1b52bda675d0

Fix sample output for 'tour' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:08:24 2008 +0200 (2008-08-20)
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
line diff
     1.1 --- a/en/examples/tour.clone-pull.out	Wed Aug 20 22:04:41 2008 +0200
     1.2 +++ b/en/examples/tour.clone-pull.out	Wed Aug 20 22:08:24 2008 +0200
     1.3 @@ -1,3 +1,4 @@
     1.4  $ \textbf{cd ..}
     1.5  $ \textbf{hg clone hello hello-pull}
     1.6 +updating working directory
     1.7  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
     2.1 --- a/en/examples/tour.clone-push.out	Wed Aug 20 22:04:41 2008 +0200
     2.2 +++ b/en/examples/tour.clone-push.out	Wed Aug 20 22:08:24 2008 +0200
     2.3 @@ -1,3 +1,4 @@
     2.4  $ \textbf{cd ..}
     2.5  $ \textbf{hg clone hello hello-push}
     2.6 +updating working directory
     2.7  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
     3.1 --- a/en/examples/tour.clone.out	Wed Aug 20 22:04:41 2008 +0200
     3.2 +++ b/en/examples/tour.clone.out	Wed Aug 20 22:08:24 2008 +0200
     3.3 @@ -5,4 +5,5 @@
     3.4  adding manifests
     3.5  adding file changes
     3.6  added 5 changesets with 5 changes to 2 files
     3.7 +updating working directory
     3.8  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
     4.1 --- a/en/examples/tour.diff.out	Wed Aug 20 22:04:41 2008 +0200
     4.2 +++ b/en/examples/tour.diff.out	Wed Aug 20 22:08:24 2008 +0200
     4.3 @@ -2,7 +2,7 @@
     4.4  diff -r  hello.c
     4.5  
     4.6  
     4.7 -@@ -8,5 +8,6 @@ int main(int argc, char **argv)
     4.8 +@@ -8,5 +8,6 @@
     4.9   int main(int argc, char **argv)
    4.10   \{
    4.11   	printf("hello, world!\textbackslash{}");
     5.1 --- a/en/examples/tour.help.out	Wed Aug 20 22:04:41 2008 +0200
     5.2 +++ b/en/examples/tour.help.out	Wed Aug 20 22:08:24 2008 +0200
     5.3 @@ -3,7 +3,7 @@
     5.4  
     5.5  create a new repository in the given directory
     5.6  
     5.7 -    Initialize a new repository in the given directory.  If the given
     5.8 +    Initialize a new repository in the given directory. If the given
     5.9      directory does not exist, it is created.
    5.10  
    5.11      If no directory is given, the current directory is used.
     6.1 --- a/en/examples/tour.merge.clone.out	Wed Aug 20 22:04:41 2008 +0200
     6.2 +++ b/en/examples/tour.merge.clone.out	Wed Aug 20 22:08:24 2008 +0200
     6.3 @@ -1,5 +1,6 @@
     6.4  $ \textbf{cd ..}
     6.5  $ \textbf{hg clone hello my-new-hello}
     6.6 +updating working directory
     6.7  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
     6.8  $ \textbf{cd my-new-hello}
     6.9  $ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
     7.1 --- a/en/examples/tour.merge.update.out	Wed Aug 20 22:04:41 2008 +0200
     7.2 +++ b/en/examples/tour.merge.update.out	Wed Aug 20 22:08:24 2008 +0200
     7.3 @@ -1,2 +1,2 @@
     7.4  $ \textbf{hg update}
     7.5 -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
     7.6 +abort: crosses branches (use 'hg merge' or 'hg update -C')
     8.1 --- a/en/examples/tour.reclone.out	Wed Aug 20 22:04:41 2008 +0200
     8.2 +++ b/en/examples/tour.reclone.out	Wed Aug 20 22:08:24 2008 +0200
     8.3 @@ -1,4 +1,5 @@
     8.4  $ \textbf{cd ..}
     8.5  $ \textbf{hg clone hello my-hello}
     8.6 +updating working directory
     8.7  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
     8.8  $ \textbf{cd my-hello}
     9.1 --- a/en/examples/tour.tip.out	Wed Aug 20 22:04:41 2008 +0200
     9.2 +++ b/en/examples/tour.tip.out	Wed Aug 20 22:08:24 2008 +0200
     9.3 @@ -11,7 +11,7 @@
     9.4  diff -r  -r  hello.c
     9.5  
     9.6  
     9.7 -@@ -8,5 +8,6 @@ int main(int argc, char **argv)
     9.8 +@@ -8,5 +8,6 @@
     9.9   int main(int argc, char **argv)
    9.10   \{
    9.11   	printf("hello, world!\textbackslash{}");
    10.1 --- a/en/examples/tour.version.out	Wed Aug 20 22:04:41 2008 +0200
    10.2 +++ b/en/examples/tour.version.out	Wed Aug 20 22:08:24 2008 +0200
    10.3 @@ -1,6 +1,6 @@
    10.4  $ \textbf{hg version}
    10.5  Mercurial Distributed SCM (version )
    10.6  
    10.7 -Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others
    10.8 +Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
    10.9  This is free software; see the source for copying conditions. There is NO
   10.10  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.