update tests

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

update tests

manifest hash: 70079385599132ca8f90582e1f9317ca46167532
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA
kV4Os9FG1NmGaCysPIsKwts=
=Ee67
-----END PGP SIGNATURE-----

tests/test-basic.out

@@ -1,23 +1,24 b''
 + mkdir t
 + cd t
 + hg init
 + echo a
 + hg add a
 + hg commit -t test -u test -d '0 0'
 + hg history
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
+
 + hg manifest
 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
 + hg cat a
 a
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions

tests/test-copy.out

@@ -1,52 +1,55 b''
 + hg init
 + echo a
 + hg add a
 + hg commit -t 1 -u test -d '0 0'
 + hg status
 ? .out
 + cp a b
 + hg copy a b
 + hg status
 A b
 ? .out
 + hg --debug commit -t 2 -u test -d '0 0'
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 + hg history
 changeset:   1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
+
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     1
 
+
 + hg log a
 revision:    0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 user:        test
 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
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 2 files, 2 changesets, 2 total revisions

tests/test-flags.out

@@ -1,72 +1,75 b''
 + umask 027
 + mkdir test1
 + cd test1
 + hg init
 + touch a b
 + hg add a b
 + hg ci -t 'added a b' -u test -d '0 0'
 + cd ..
 + mkdir test2
 + cd test2
 + hg init
 + hg pull ../test1
 pulling from ../test1
 requesting all changes
 adding changesets
 adding manifests
 adding file revisions
 modified 2 files, added 1 changesets and 2 new revisions
 (run 'hg update' to get a working copy)
 + hg co
 + chmod +x a
 + hg ci -t 'chmod +x a' -u test -d '0 0'
 + cd ../test1
 + echo 123
 + hg ci -t 'a updated' -u test -d '0 0'
 + hg pull ../test2
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
 adding file revisions
 modified 1 files, added 1 changesets and 1 new revisions
 (run 'hg update' to get a working copy)
 + hg heads
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
 + hg history
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
+
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
+
 changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
+
 + hg -v co -m
 resolving manifests
 merging a
 resolving a
 + ls -l ../test1/a ../test2/a
 + cut -b 0-10
 -rwxr-x---
 -rwxr-x---

tests/test-pull

@@ -1,21 +1,21 b''
 #!/bin/sh
 
 mkdir test
 cd test
 echo foo>foo
 hg init
 hg addremove
 hg commit -t "1"
 hg verify
-hg serve -p 20059 2>/dev/null &
+hg serve -p 20059 >/dev/null 2>&1 &
 cd ..
 
 hg clone http://localhost:20059/ copy
 cd copy
 hg verify
 hg co
 cat foo
 hg manifest
 hg pull
 
 kill $!

tests/test-tag.out

@@ -1,31 +1,34 b''
 + hg init
 + echo a
 + hg add a
 + hg commit -t test -u test -d '0 0'
 + hg history
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
+
 + hg tag -u test -d '0 0' bleah
 + hg history
 changeset:   1:863197ef03781c4fc00276d83eb66c4cb9cd91df
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
 
+
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         bleah
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     test
 
+
 + echo foo
 + hg tag -u test -d '0 0' bleah2
 abort: working copy of .hgtags is changed!
 (please commit .hgtags manually)
 + echo failed
 failed

tests/test-up-local-change.out

@@ -1,74 +1,76 b''
 + mkdir r1
 + cd r1
 + hg init
 + echo a
 + hg addremove
 + hg commit -t 1 -u test -d '0 0'
 + hg clone . ../r2
 + cd ../r2
 + hg up
 + echo abc
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 + cd ../r1
 + echo b
 + echo a2
 + hg addremove
 + hg commit -t 2 -u test -d '0 0'
 + cd ../r2
 + hg -q pull ../r1
 + hg status
 C a
 + hg --debug up
 resolving manifests
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg --debug up -m
 resolving manifests
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 + hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a b
 description:
 2
 
 
+
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 1
 
 
+
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 diff -r 1e71731e6fbb a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc