Mercurial > hg > gitweb

changeset 374:f07d00fcd281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author mpm@selenic.com
date Wed, 15 Jun 2005 21:12:28 -0800
parents 67081329d49a
children b29219389b00
files tests/test-conflict.out tests/test-tags.out tests/test-up-local-change.out
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict.out	Wed Jun 15 21:11:40 2005 -0800
+++ b/tests/test-conflict.out	Wed Jun 15 21:12:28 2005 -0800
@@ -12,15 +12,15 @@
 + 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 '<<<'
--- a/tests/test-tags.out	Wed Jun 15 21:11:40 2005 -0800
+++ b/tests/test-tags.out	Wed Jun 15 21:12:28 2005 -0800
@@ -8,7 +8,7 @@
 + 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
@@ -21,15 +21,15 @@
 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
@@ -38,10 +38,10 @@
 + 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
--- a/tests/test-up-local-change.out	Wed Jun 15 21:11:40 2005 -0800
+++ b/tests/test-up-local-change.out	Wed Jun 15 21:12:28 2005 -0800
@@ -28,16 +28,16 @@
 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