Mercurial > hgbook

changeset 396:bd8d96d3703d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for 'mq' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:53:01 +0200
parents e0b56f008b09
children 2b8c6aa370d5
files en/examples/mq.tarball.download.out en/examples/mq.tarball.newsource.out en/examples/mq.tarball.qinit.out en/examples/mq.tarball.repush.out en/examples/mq.tutorial.qnew2.out en/examples/mq.tutorial.qrefresh.out en/examples/mq.tutorial.qrefresh2.out
diffstat 7 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/en/examples/mq.tarball.download.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tarball.download.out	Wed Aug 20 21:53:01 2008 +0200
@@ -5,4 +5,5 @@
 $ \textbf{hg commit -q --addremove --message netplug-1.2.5}
 $ \textbf{cd ..}
 $ \textbf{hg clone netplug-1.2.5 netplug}
+updating working directory
 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/en/examples/mq.tarball.newsource.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tarball.newsource.out	Wed Aug 20 21:53:01 2008 +0200
@@ -3,6 +3,7 @@
 $ \textbf{cd ..}
 $ \textbf{download netplug-1.2.8.tar.bz2}
 $ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}
+updating working directory
 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{cd netplug-1.2.8}
 $ \textbf{hg locate -0 | xargs -0 rm}
--- a/en/examples/mq.tarball.qinit.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tarball.qinit.out	Wed Aug 20 21:53:01 2008 +0200
@@ -16,7 +16,7 @@
 diff -r  -r  netlink.c
 
 
-@@ -275,7 +275,7 @@ netlink_open(void)
+@@ -275,7 +275,7 @@
          exit(1);
      \}
  
--- a/en/examples/mq.tarball.repush.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tarball.repush.out	Wed Aug 20 21:53:01 2008 +0200
@@ -8,5 +8,6 @@
 added 1 changesets with 12 changes to 12 files
 (run 'hg update' to get a working copy)
 $ \textbf{hg qpush -a}
+(working directory not at tip)
 applying build-fix.patch
 Now at: build-fix.patch
--- a/en/examples/mq.tutorial.qnew2.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tutorial.qnew2.out	Wed Aug 20 21:53:01 2008 +0200
@@ -15,7 +15,7 @@
 diff -r  -r  file1
 
 
-@@ -1,3 +1,4 @@ line 1
+@@ -1,3 +1,4 @@
  line 1
  line 2
  line 3
--- a/en/examples/mq.tutorial.qrefresh.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tutorial.qrefresh.out	Wed Aug 20 21:53:01 2008 +0200
@@ -3,7 +3,7 @@
 diff -r  file1
 
 
-@@ -1,1 +1,2 @@ line 1
+@@ -1,1 +1,2 @@
  line 1
 +line 2
 $ \textbf{hg qrefresh}
@@ -15,7 +15,7 @@
 diff -r  -r  file1
 
 
-@@ -1,1 +1,2 @@ line 1
+@@ -1,1 +1,2 @@
  line 1
 +line 2
 
--- a/en/examples/mq.tutorial.qrefresh2.out	Wed Aug 20 21:51:54 2008 +0200
+++ b/en/examples/mq.tutorial.qrefresh2.out	Wed Aug 20 21:53:01 2008 +0200
@@ -9,7 +9,7 @@
 diff -r  -r  file1
 
 
-@@ -1,1 +1,3 @@ line 1
+@@ -1,1 +1,3 @@
  line 1
 +line 2
 +line 3