# HG changeset patch # User Matt Mackall # Date 2005-07-04 20:54:42 # Node ID d96c1153b25da9990a28718cf51b7cefd92494a6 # Parent 4051b78c53c71ca050393d1d5bd41072923c5dd0 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----- diff --git a/tests/test-basic.out b/tests/test-basic.out --- a/tests/test-basic.out +++ b/tests/test-basic.out @@ -11,6 +11,7 @@ user: test date: Thu Jan 1 00:00:00 1970 summary: test + + hg manifest b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a + hg cat a diff --git a/tests/test-copy.out b/tests/test-copy.out --- a/tests/test-copy.out +++ b/tests/test-copy.out @@ -19,11 +19,13 @@ 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 @@ -31,6 +33,7 @@ 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| diff --git a/tests/test-flags.out b/tests/test-flags.out --- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -52,16 +52,19 @@ 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 diff --git a/tests/test-merge6 b/tests/test-merge6 old mode 100644 new mode 100755 diff --git a/tests/test-pull b/tests/test-pull --- a/tests/test-pull +++ b/tests/test-pull @@ -7,7 +7,7 @@ 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 diff --git a/tests/test-tag.out b/tests/test-tag.out --- a/tests/test-tag.out +++ b/tests/test-tag.out @@ -9,6 +9,7 @@ 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 @@ -17,12 +18,14 @@ 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! diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out --- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -55,6 +55,7 @@ description: 2 + changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test @@ -64,6 +65,7 @@ description: 1 + + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r 1e71731e6fbb a