hgbook
changeset 297:bd8d96d3703d
Fix sample output for 'mq' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed Aug 20 21:53:01 2008 +0200 (2008-08-20) |
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 |
line diff
1.1 --- a/en/examples/mq.tarball.download.out Wed Aug 20 21:51:54 2008 +0200 1.2 +++ b/en/examples/mq.tarball.download.out Wed Aug 20 21:53:01 2008 +0200 1.3 @@ -5,4 +5,5 @@ 1.4 $ \textbf{hg commit -q --addremove --message netplug-1.2.5} 1.5 $ \textbf{cd ..} 1.6 $ \textbf{hg clone netplug-1.2.5 netplug} 1.7 +updating working directory 1.8 18 files updated, 0 files merged, 0 files removed, 0 files unresolved
2.1 --- a/en/examples/mq.tarball.newsource.out Wed Aug 20 21:51:54 2008 +0200 2.2 +++ b/en/examples/mq.tarball.newsource.out Wed Aug 20 21:53:01 2008 +0200 2.3 @@ -3,6 +3,7 @@ 2.4 $ \textbf{cd ..} 2.5 $ \textbf{download netplug-1.2.8.tar.bz2} 2.6 $ \textbf{hg clone netplug-1.2.5 netplug-1.2.8} 2.7 +updating working directory 2.8 18 files updated, 0 files merged, 0 files removed, 0 files unresolved 2.9 $ \textbf{cd netplug-1.2.8} 2.10 $ \textbf{hg locate -0 | xargs -0 rm}
3.1 --- a/en/examples/mq.tarball.qinit.out Wed Aug 20 21:51:54 2008 +0200 3.2 +++ b/en/examples/mq.tarball.qinit.out Wed Aug 20 21:53:01 2008 +0200 3.3 @@ -16,7 +16,7 @@ 3.4 diff -r -r netlink.c 3.5 3.6 3.7 -@@ -275,7 +275,7 @@ netlink_open(void) 3.8 +@@ -275,7 +275,7 @@ 3.9 exit(1); 3.10 \} 3.11
4.1 --- a/en/examples/mq.tarball.repush.out Wed Aug 20 21:51:54 2008 +0200 4.2 +++ b/en/examples/mq.tarball.repush.out Wed Aug 20 21:53:01 2008 +0200 4.3 @@ -8,5 +8,6 @@ 4.4 added 1 changesets with 12 changes to 12 files 4.5 (run 'hg update' to get a working copy) 4.6 $ \textbf{hg qpush -a} 4.7 +(working directory not at tip) 4.8 applying build-fix.patch 4.9 Now at: build-fix.patch
5.1 --- a/en/examples/mq.tutorial.qnew2.out Wed Aug 20 21:51:54 2008 +0200 5.2 +++ b/en/examples/mq.tutorial.qnew2.out Wed Aug 20 21:53:01 2008 +0200 5.3 @@ -15,7 +15,7 @@ 5.4 diff -r -r file1 5.5 5.6 5.7 -@@ -1,3 +1,4 @@ line 1 5.8 +@@ -1,3 +1,4 @@ 5.9 line 1 5.10 line 2 5.11 line 3
6.1 --- a/en/examples/mq.tutorial.qrefresh.out Wed Aug 20 21:51:54 2008 +0200 6.2 +++ b/en/examples/mq.tutorial.qrefresh.out Wed Aug 20 21:53:01 2008 +0200 6.3 @@ -3,7 +3,7 @@ 6.4 diff -r file1 6.5 6.6 6.7 -@@ -1,1 +1,2 @@ line 1 6.8 +@@ -1,1 +1,2 @@ 6.9 line 1 6.10 +line 2 6.11 $ \textbf{hg qrefresh} 6.12 @@ -15,7 +15,7 @@ 6.13 diff -r -r file1 6.14 6.15 6.16 -@@ -1,1 +1,2 @@ line 1 6.17 +@@ -1,1 +1,2 @@ 6.18 line 1 6.19 +line 2 6.20