# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1122646862 -3600
# Node ID 1f9ec150a476567b58e048f287556c4fdfe04d11
# Parent  ec85f9e6f3b1078a0f9283f4e33365cdd83a5aea
Updated output of tests.


diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-backwards-remove.out
--- a/tests/test-backwards-remove.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-backwards-remove.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,12 +1,8 @@
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ ls
++ hg commit -m commit #0 -d 0 0
 a
-+ echo This is file b1
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
++ hg commit -m commit #1 -d 0 0
 + hg co 0
-+ ls
 a
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-bad-pull.out
--- a/tests/test-bad-pull.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-bad-pull.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,15 +1,9 @@
 + hg clone http://localhost:20059/ copy
 requesting all changes
 abort: error: Connection refused
-+ echo 255
 255
-+ ls copy
 ls: copy: No such file or directory
-+ cat
-+ set +x
 + hg clone http://localhost:20059/foo copy2
 requesting all changes
 abort: HTTP Error 404: File not found
-+ echo 255
 255
-+ set +x
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-basic.out
--- a/tests/test-basic.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-basic.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,9 +1,6 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 + hg history
 changeset:   0:acb14030fe0a
 tag:         tip
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-clone-failure.out
--- a/tests/test-clone-failure.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-clone-failure.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,39 +1,20 @@
 + hg clone a b
 abort: repository a/.hg not found!
-+ echo 255
 255
 + hg clone http://127.0.0.1:3121/a b
 requesting all changes
 abort: error: Connection refused
-+ echo 255
 255
-+ rm -rf b
-+ mkdir a
-+ chmod 000 a
 + hg clone a b
 abort: repository a/.hg not found!
-+ echo 255
 255
-+ mkdir b
-+ cd b
 + hg init
 + hg clone . ../a
 abort: destination '../a' already exists
-+ echo 1
 1
-+ cd ..
-+ chmod 700 a
-+ rm -rf a b
-+ mkfifo a
 + hg clone a b
 abort: repository a/.hg not found!
-+ echo 255
 255
-+ rm a
-+ mkdir q
-+ cd q
 + hg init
-+ cd ..
 + hg clone q
 abort: destination 'q' already exists
-+ true
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-clone.out
--- a/tests/test-clone.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-clone.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,12 +1,7 @@
-+ mkdir a
-+ cd a
 + hg init
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 + hg clone . ../b
-+ cd ../b
-+ cat a
 a
 + hg verify
 checking changesets
@@ -15,8 +10,6 @@
 checking files
 1 files, 1 changesets, 1 total revisions
 + hg clone -U . ../c
-+ cd ../c
-+ cat a
 cat: a: No such file or directory
 + hg verify
 checking changesets
@@ -24,9 +17,6 @@
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-+ mkdir ../d
-+ cd ../d
 + hg clone ../a
-+ cd a
 + hg cat a
 a
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-conflict.out
--- a/tests/test-conflict.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-conflict.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,24 +1,17 @@
 + hg init
-+ echo nothing
 + hg add a
-+ hg commit -m ancestor -d '0 0'
-+ echo something
-+ hg commit -m branch1 -d '0 0'
++ hg commit -m ancestor -d 0 0
++ hg commit -m branch1 -d 0 0
 + hg co 0
-+ echo 'something else'
-+ hg commit -m branch2 -d '0 0'
-+ export HGMERGE=merge
-+ HGMERGE=merge
++ hg commit -m branch2 -d 0 0
 + hg up -m 1
 merge: warning: conflicts during merge
 merging a
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip
-+ grep -Ev '>>>|<<<' a
 something else
 =======
 something
 + hg status
 M a
-? .out
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-copy.out
--- a/tests/test-copy.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-copy.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,15 +1,11 @@
 + hg init
-+ echo a
 + hg add a
-+ hg commit -m 1 -d '0 0'
++ hg commit -m 1 -d 0 0
 + hg status
-? .out
-+ cp a b
 + hg copy a b
 + hg status
 A b
-? .out
-+ hg --debug commit -m 2 -d '0 0'
++ hg --debug commit -m 2 -d 0 0
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 + hg history
@@ -30,19 +26,9 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     1
 
-+ hexdump -C .hg/data/b.d
-00000000  75 01 0a 63 6f 70 79 72  65 76 3a 20 62 37 38 39  |u..copyrev: b789|
-00000010  66 64 64 39 36 64 63 32  66 33 62 64 32 32 39 63  |fdd96dc2f3bd229c|
-00000020  31 64 64 38 65 65 64 66  30 66 63 36 30 65 32 62  |1dd8eedf0fc60e2b|
-00000030  36 38 65 33 0a 63 6f 70  79 3a 20 61 0a 01 0a 61  |68e3.copy: a...a|
-00000040  0a                                                |.|
-00000041
-+ hg cat b
-+ md5sum bsum
-60b725f10c9c85c70d97880dfe8191b3  bsum
-+ hg cat a
-+ md5sum asum
-60b725f10c9c85c70d97880dfe8191b3  asum
+566e338d09a089ba737c21e0d3759980  .hg/data/b.d
+3268d2f51b2d2d423ff01b59eb6fbb14  bsum
+70909ca2ecf494c71e9184b445e040ee  asum
 + hg verify
 checking changesets
 checking manifests
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-diffdir.out
--- a/tests/test-diffdir.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-diffdir.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,8 +1,14 @@
++ hg init
++ hg add a
++ hg ci -m a -d 0 0
++ hg add b
++ hg diff
 diff -r 3903775176ed b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123
++ hg diff -r tip
 diff -r 3903775176ed b
 --- /dev/null
 +++ b/b
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-empty-dir.out
--- a/tests/test-empty-dir.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-empty-dir.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,3 +1,9 @@
++ hg init
++ hg add a
++ hg commit -m first -d 0 0 a
++ hg add sub/b
++ hg commit -m second -d 0 0 sub/b
 321
++ hg co 0
 cat: sub/b: No such file or directory
 ls: sub: No such file or directory
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-flags.out
--- a/tests/test-flags.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-flags.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,13 +1,6 @@
-+ umask 027
-+ mkdir test1
-+ cd test1
 + hg init
-+ touch a b
 + hg add a b
-+ hg ci -m 'added a b' -d '0 0'
-+ cd ..
-+ mkdir test2
-+ cd test2
++ hg ci -m added a b -d 0 0
 + hg init
 + hg pull ../test1
 pulling from ../test1
@@ -18,11 +11,8 @@
 added 1 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
 + hg co
-+ chmod +x a
-+ hg ci -m 'chmod +x a' -d '0 0'
-+ cd ../test1
-+ echo 123
-+ hg ci -m 'a updated' -d '0 0'
++ hg ci -m chmod +x a -d 0 0
++ hg ci -m a updated -d 0 0
 + hg pull ../test2
 pulling from ../test2
 searching for changes
@@ -66,7 +56,5 @@
 resolving manifests
 merging a
 resolving a
-+ ls -l ../test1/a ../test2/a
-+ cut -b 0-10
 -rwxr-x---
 -rwxr-x---
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-help.out
--- a/tests/test-help.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-help.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,3 +1,4 @@
++ hg help
 basic hg commands (use "hg help -v" for more):
 
  add        add the specified files on the next commit
@@ -15,6 +16,7 @@
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory
++ hg -q help
 basic hg commands (use "hg help -v" for more):
 
  add        add the specified files on the next commit
@@ -32,6 +34,7 @@
  serve      export the repository via HTTP
  status     show changed files in the working directory
  update     update or merge working directory
++ hg add -h
 hg add: option -h not recognized
 hg add [FILE]...
 
@@ -41,6 +44,7 @@
    exclude path from search
 
 add the specified files on the next commit
++ hg add --skjdfks
 hg add: option --skjdfks not recognized
 hg add [FILE]...
 
@@ -50,6 +54,7 @@
    exclude path from search
 
 add the specified files on the next commit
++ hg help diff
 hg diff [-r REV1 [-r REV2]] [FILE]...
 
  -r --rev 
@@ -60,7 +65,9 @@
    exclude path from search
 
 diff working directory (or selected files)
++ hg help foo
 hg: unknown command foo
++ hg -q commands
 hg: unknown command 'commands'
 basic hg commands (use "hg help -v" for more):
 
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-hook.out
--- a/tests/test-hook.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-hook.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,9 +1,5 @@
 + hg init
-+ echo '[hooks]'
-+ echo 'precommit = echo precommit hook'
-+ echo 'commit = echo commit hook: $NODE'
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 precommit hook
 commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-hup.out
--- a/tests/test-hup.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-hup.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,3 +1,5 @@
++ hg init
++ hg serve --stdio
 0
 0
 adding changesets
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge-revert.out
--- a/tests/test-merge-revert.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge-revert.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,12 +1,7 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo 'added file1'
-+ echo 'added file2'
 + hg add file1 file2
-+ hg commit -m 'added file1 and file2' -d '0 0' -u user
-+ echo 'changed file1'
-+ hg commit -m 'changed file1' -d '0 0' -u user
++ hg commit -m added file1 and file2 -d 0 0 -u user
++ hg commit -m changed file1 -d 0 0 -u user
 + hg -q log
 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
 0:8633637036c18f021d771208e16ae3508ab81d28
@@ -15,7 +10,6 @@
 + hg update -C 0
 + hg id
 8633637036c1
-+ echo 'changed file1'
 + hg id
 8633637036c1+
 + hg revert
@@ -29,8 +23,6 @@
 + hg id
 3aa14bbc23d9 tip
 + hg update -C 0
-+ echo 'changed file1'
-+ HGMERGE=merge
 + hg update
 merging file1
 + hg diff
@@ -52,5 +44,3 @@
 + hg status
 + hg id
 3aa14bbc23d9 tip
-+ cd ..
-+ /bin/rm -rf t
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge-revert2.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,12 +1,7 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo 'added file1'
-+ echo 'added file2'
 + hg add file1 file2
-+ hg commit -m 'added file1 and file2' -d '0 0' -u user
-+ echo 'changed file1'
-+ hg commit -m 'changed file1' -d '0 0' -u user
++ hg commit -m added file1 and file2 -d 0 0 -u user
++ hg commit -m changed file1 -d 0 0 -u user
 + hg -q log
 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
 0:8633637036c18f021d771208e16ae3508ab81d28
@@ -15,7 +10,6 @@
 + hg update -C 0
 + hg id
 8633637036c1
-+ echo 'changed file1'
 + hg id
 8633637036c1+
 + hg revert
@@ -29,14 +23,11 @@
 + hg id
 3aa14bbc23d9 tip
 + hg update -C 0
-+ echo 'changed file1 different'
-+ HGMERGE=merge
 + hg update
 merge: warning: conflicts during merge
 merging file1
 merging file1 failed!
 + hg diff
-+ sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/'
 diff -r 3aa14bbc23d9 file1
 --- a/file1
 +++ b/file1
@@ -66,5 +57,3 @@
 + hg status
 + hg id
 3aa14bbc23d9 tip
-+ cd ..
-+ /bin/rm -rf t
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge1.out
--- a/tests/test-merge1.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge1.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,82 +1,45 @@
-+ cat
-+ chmod +x merge
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
++ hg commit -m commit #1 -d 0 0
 + hg update 0
-+ echo This is file c1
 + hg add c
-+ hg commit -m 'commit #2' -d '0 0'
-+ echo This is file b1
-+ env HGMERGE=../merge hg update -m 1
-+ cd ..
-+ /bin/rm -rf t
-+ mkdir t
-+ cd t
++ hg commit -m commit #2 -d 0 0
++ hg update -m 1
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
++ hg commit -m commit #1 -d 0 0
 + hg update 0
-+ echo This is file c1
 + hg add c
-+ hg commit -m 'commit #2' -d '0 0'
-+ echo This is file b2
-+ env HGMERGE=../merge hg update -m 1
++ hg commit -m commit #2 -d 0 0
++ hg update -m 1
 merging for b
 merging b
-+ cd ..
-+ /bin/rm -rf t
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
-+ echo This is file b22
-+ hg commit -m 'commit #2' -d '0 0'
++ hg commit -m commit #1 -d 0 0
++ hg commit -m commit #2 -d 0 0
 + hg update 1
-+ echo This is file c1
 + hg add c
-+ hg commit -m 'commit #3' -d '0 0'
-+ cat b
++ hg commit -m commit #3 -d 0 0
 This is file b1
-+ echo This is file b22
-+ env HGMERGE=../merge hg update -m 2
++ hg update -m 2
 merging for b
 merging b
-+ cd ..
-+ /bin/rm -rf t
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
-+ echo This is file b22
-+ hg commit -m 'commit #2' -d '0 0'
++ hg commit -m commit #1 -d 0 0
++ hg commit -m commit #2 -d 0 0
 + hg update 1
-+ echo This is file c1
 + hg add c
-+ hg commit -m 'commit #3' -d '0 0'
-+ echo This is file b33
-+ env HGMERGE=../merge hg update -m 2
++ hg commit -m commit #3 -d 0 0
++ hg update -m 2
 merging for b
 merging b
-+ cd ..
-+ /bin/rm -rf t
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge2.out
--- a/tests/test-merge2.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge2.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,49 +1,25 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
-+ rm b
++ hg commit -m commit #1 -d 0 0
 + hg update 0
-+ echo This is file b2
 + hg add b
-+ hg commit -m 'commit #2' -d '0 0'
-+ cd ..
-+ /bin/rm -rf t
-+ mkdir t
-+ cd t
++ hg commit -m commit #2 -d 0 0
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
-+ rm b
++ hg commit -m commit #1 -d 0 0
 + hg update 0
-+ echo This is file b2
-+ hg commit -A -m 'commit #2' -d '0 0'
++ hg commit -A -m commit #2 -d 0 0
 adding b
-+ cd ..
-+ /bin/rm -rf t
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
-+ rm b
++ hg commit -m commit #1 -d 0 0
 + hg remove b
 + hg update 0
-+ echo This is file b2
-+ hg commit -A -m 'commit #2' -d '0 0'
++ hg commit -A -m commit #2 -d 0 0
 adding b
-+ cd ..
-+ /bin/rm -rf t
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge3.out
--- a/tests/test-merge3.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge3.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,11 +1,8 @@
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ touch b
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ rm b
-+ hg commit -A '-mcomment #1' -d '0 0'
-adding .out
++ hg commit -A -mcomment #1 -d 0 0
 removing b
 b never committed!
+nothing changed
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge4.out
--- a/tests/test-merge4.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge4.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,15 +1,10 @@
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b1
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ hg commit -m 'commit #1' -d '0 0'
++ hg commit -m commit #1 -d 0 0
 + hg update 0
-+ echo This is file c1
 + hg add c
-+ hg commit -m 'commit #2' -d '0 0'
++ hg commit -m commit #2 -d 0 0
 + hg update -m 1
-+ rm b
-+ echo This is file c22
-+ hg commit -m 'commit #3' -d '0 0'
++ hg commit -m commit #3 -d 0 0
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge5.out
--- a/tests/test-merge5.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge5.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,20 +1,12 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
-+ echo This is file b1
 + hg add a b
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b22
-+ hg commit '-mcomment #1' -d '0 0'
++ hg commit -m commit #0 -d 0 0
++ hg commit -mcomment #1 -d 0 0
 + hg update 0
-+ rm b
-+ hg commit -A '-mcomment #2' -d '0 0'
++ hg commit -A -mcomment #2 -d 0 0
 removing b
-+ yes k
 + hg update 1
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
 (use update -m to perform a branch merge)
-+ exit 0
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-merge6.out
--- a/tests/test-merge6.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge6.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,27 +1,12 @@
-+ cat
-+ chmod +x merge
-+ export HGMERGE=./merge
-+ HGMERGE=./merge
-+ mkdir A1
-+ cd A1
 + hg init
-+ echo This is file foo1
-+ echo This is file bar1
 + hg add foo bar
-+ hg commit -m 'commit text' -d '0 0'
-+ cd ..
++ hg commit -m commit text -d 0 0
 + hg clone A1 B1
-+ cd A1
-+ rm bar
 + hg remove bar
-+ hg commit -m 'commit test' -d '0 0'
-+ cd ../B1
-+ echo This is file foo22
-+ hg commit -m 'commit test' -d '0 0'
-+ cd ..
++ hg commit -m commit test -d 0 0
++ hg commit -m commit test -d 0 0
 + hg clone A1 A2
 + hg clone B1 B2
-+ cd A1
 + hg pull ../B1
 pulling from ../B1
 searching for changes
@@ -31,12 +16,10 @@
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 + hg update -m
-+ hg commit -m 'commit test' -d '0 0'
-+ echo bar should remain deleted.
++ hg commit -m commit test -d 0 0
 bar should remain deleted.
 + hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
-+ cd ../B2
 + hg pull ../A2
 pulling from ../A2
 searching for changes
@@ -46,8 +29,7 @@
 added 1 changesets with 0 changes to 0 files
 (run 'hg update' to get a working copy)
 + hg update -m
-+ hg commit -m 'commit test' -d '0 0'
-+ echo bar should remain deleted.
++ hg commit -m commit test -d 0 0
 bar should remain deleted.
 + hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-pull.out
--- a/tests/test-pull.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-pull.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,21 +1,30 @@
++ hg init
++ hg addremove
 adding foo
++ hg commit -m 1
++ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
++ hg clone http://localhost:20059/ copy
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
++ hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
++ hg co
 foo
++ hg manifest
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
++ hg pull
 pulling from http://localhost:20059/
 searching for changes
 no changes found
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-rawcommit1.out
--- a/tests/test-rawcommit1.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-rawcommit1.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,15 +1,12 @@
 + hg --debug init
-+ echo this is a1
 + hg add a
-+ hg commit -m0 -d '0 0'
-+ echo this is b1
++ hg commit -m0 -d 0 0
 + hg add b
-+ hg commit -m1 -d '0 0'
++ hg commit -m1 -d 0 0
 + hg manifest 1
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
-+ echo this is c1
-+ hg rawcommit -p 1 -d '0 0' -m2 c
++ hg rawcommit -p 1 -d 0 0 -m2 c
 + hg manifest 2
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
@@ -21,8 +18,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
-+ rm b
-+ hg rawcommit -p 2 -d '0 0' -m3 b
++ hg rawcommit -p 2 -d 0 0 -m3 b
 + hg manifest 3
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
@@ -33,8 +29,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     3
 
-+ echo this is a22
-+ hg rawcommit -p 3 -d '0 0' -m4 a
++ hg rawcommit -p 3 -d 0 0 -m4 a
 + hg manifest 4
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
@@ -45,8 +40,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
-+ echo this is c22
-+ hg rawcommit -p 1 -d '0 0' -m5 c
++ hg rawcommit -p 1 -d 0 0 -m5 c
 + hg manifest 5
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
@@ -57,7 +51,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     4
 
-+ hg rawcommit -p 4 -p 5 -d '0 0' -m6
++ hg rawcommit -p 4 -p 5 -d 0 0 -m6
 + hg manifest 6
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
@@ -70,7 +64,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     6
 
-+ hg rawcommit -p 6 -d '0 0' -m7
++ hg rawcommit -p 6 -d 0 0 -m7
 + hg manifest 7
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-simple-update.out
--- a/tests/test-simple-update.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-simple-update.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,6 +1,3 @@
-+ mkdir test
-+ cd test
-+ echo foo
 + hg init
 + hg addremove
 adding foo
@@ -12,11 +9,8 @@
 checking files
 1 files, 1 changesets, 1 total revisions
 + hg clone . ../branch
-+ cd ../branch
 + hg co
-+ echo bar
 + hg commit -m 2
-+ cd ../test
 + hg pull ../branch
 pulling from ../branch
 searching for changes
@@ -32,7 +26,6 @@
 checking files
 1 files, 2 changesets, 2 total revisions
 + hg co
-+ cat foo
 foo
 bar
 + hg manifest
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-tag.out
--- a/tests/test-tag.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-tag.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,7 +1,6 @@
 + hg init
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 + hg history
 changeset:   0:acb14030fe0a
 tag:         tip
@@ -9,7 +8,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ hg tag -d '0 0' bleah
++ hg tag -d 0 0 bleah
 + hg history
 changeset:   1:863197ef0378
 tag:         tip
@@ -23,9 +22,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
-+ echo foo
-+ hg tag -d '0 0' bleah2
++ hg tag -d 0 0 bleah2
 abort: working copy of .hgtags is changed!
 (please commit .hgtags manually)
-+ echo failed
 failed
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-tags.out
--- a/tests/test-tags.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-tags.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,32 +1,25 @@
-+ mkdir t
-+ cd t
 + hg init
 + hg id
 unknown
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 + hg co
 + hg identify
 acb14030fe0a tip
-++ hg -q tip
-++ cut -d : -f 2
-+ T=acb14030fe0a21b60322c440ad2d20cf7685a376
-+ echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'
-+ cat .hgtags
++ hg -q tip
 acb14030fe0a21b60322c440ad2d20cf7685a376 first
 + hg add .hgtags
-+ hg commit -m 'add tags' -d '0 0'
++ hg commit -m add tags -d 0 0
 + hg tags
-tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
+tip                                1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2
 first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
+hg -q tip                          ?:?
 + hg identify
-b9154636be93 tip
-+ echo bb
+b53d0e1f3043 tip
 + hg status
 M a
 + hg identify
-b9154636be93+ tip
+b53d0e1f3043+ tip
 + hg co first
 + hg id
 acb14030fe0a+ first
@@ -34,14 +27,13 @@
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
 + hg status
 M a
-+ echo 1
 + hg add b
-+ hg commit -m branch -d '0 0'
++ hg commit -m branch -d 0 0
 + hg id
 c8edf04160c7 tip
 + hg co -m 1
 + hg id
-c8edf04160c7+b9154636be93+ tip
+c8edf04160c7+b53d0e1f3043+ tip
 + hg status
 M .hgtags
 M a
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-undo.out
--- a/tests/test-undo.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-undo.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,9 +1,6 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo a
 + hg add a
-+ hg commit -m test -d '0 0'
++ hg commit -m test -d 0 0
 + hg verify
 checking changesets
 checking manifests
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-unrelated-pull.out
--- a/tests/test-unrelated-pull.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-unrelated-pull.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,3 +1,10 @@
++ hg init
++ hg add a
++ hg commit -m a -u a -d 0 0
++ hg init
++ hg add b
++ hg commit -m b -u b -d 0 0
++ hg pull ../a
 pulling from ../a
 searching for changes
 warning: pulling from an unrelated repository!
@@ -6,6 +13,7 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
++ hg heads
 changeset:   1:9a79c33a9db3
 tag:         tip
 user:        a
diff -r ec85f9e6f3b1 -r 1f9ec150a476 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-up-local-change.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,29 +1,19 @@
-+ mkdir r1
-+ cd r1
 + hg init
-+ echo a
 + hg addremove
 adding a
-+ hg commit -m 1 -d '0 0'
++ hg commit -m 1 -d 0 0
 + hg clone . ../r2
-+ cd ../r2
 + hg up
-+ echo abc
 + hg diff
-+ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
-+ cd ../r1
-+ echo b
-+ echo a2
 + hg addremove
 adding b
-+ hg commit -m 2 -d '0 0'
-+ cd ../r2
++ hg commit -m 2 -d 0 0
 + hg -q pull ../r1
 + hg status
 M a
@@ -67,7 +57,6 @@
 
 
 + hg diff
-+ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
 diff -r 1e71731e6fbb a
 --- a/a
 +++ b/a