update tests to reflect new short hash length

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

update tests to reflect new short hash length

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

iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4
adIvEe7OzGeG6wn0/aRoQXY=
=h8+W
-----END PGP SIGNATURE-----

tests/test-conflict.out

@@ -1,32 +1,32 b''
 + hg init
 + echo nothing
 + hg add a
 + hg commit -t ancestor -u test -d '0 0'
 + echo something
 + hg commit -t branch1 -u test -d '0 0'
 + hg co 0
 + echo 'something else'
 + hg commit -t branch2 -u test -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
 + hg -d up -m 1
 merge: warning: conflicts during merge
 resolving manifests
- ancestor 1c6e5a12 local 35fedfab remote a5801785
+ ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
  a versions differ, resolve
 working dir created .out, keeping
 merging a
 resolving a
-file a: other d7250518 ancestor 68ba9db7
+file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
-32e80765+75234512+ tip
+32e80765d7fe+75234512624c+ tip
 + cat a
 + grep -v '>>>'
 + grep -v '<<<'
 something else
 =======
 something
 + hg status
 C a
 ? .out

tests/test-tags.out

@@ -1,47 +1,47 b''
 + mkdir t
 + cd t
 + hg init
 + hg id
 unknown
 + echo a
 + hg add a
 + hg commit -t test -u test -d '0 0'
 + hg co
 + hg identify
-acb14030 tip
+acb14030fe0a tip
 ++ hg -q tip
 ++ cut -d : -f 2
 + T=acb14030fe0a21b60322c440ad2d20cf7685a376
 + echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'
 + cat .hgtags
 acb14030fe0a21b60322c440ad2d20cf7685a376 first
 + hg add .hgtags
 + hg commit -t 'add tags' -u test -d '0 0'
 + hg tags
 tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
 first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
 + hg identify
-b9154636 tip
+b9154636be93 tip
 + echo bb
 + hg status
 C a
 + hg identify
-b9154636+ tip
+b9154636be93+ tip
 + hg co first
 + hg id
-acb14030+ first
+acb14030fe0a+ first
 + hg -v id
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
 + hg status
 C a
 + echo 1
 + hg add b
 + hg commit -t branch -u test -d '0 0'
 + hg id
-c8edf041 tip
+c8edf04160c7 tip
 + hg co -m 1
 + hg id
-c8edf041+b9154636+ tip
+c8edf04160c7+b9154636be93+ tip
 + hg status
 C a
 C .hgtags

tests/test-up-local-change.out

@@ -1,70 +1,70 b''
 + mkdir r1
 + cd r1
 + hg init
 + echo a
 + hg addremove
 + hg commit -t 1 -u test -d '0 0'
 + cd ..
 + mkdir r2
 + cd r2
 + hg init ../r1
 + hg up
 + echo abc
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 --- 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 -d up
 resolving manifests
- ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd
+ ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
-file a: other d730145a ancestor b789fdd9
+file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg -d up -m
 resolving manifests
- ancestor 1165e8bd local 1165e8bd remote 1165e8bd
+ ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 user:        test
 date:        Wed Dec 31 16:00:00 1969
 summary:     2
 
 + hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
 user:        test
 date:        Wed Dec 31 16:00:00 1969
 files:       a b
 description:
 2
 
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Wed Dec 31 16:00:00 1969
 files:       a
 description:
 1
 
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc