annotate tests/test-basic.out @ 703:fb6f85ecc863

merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:28:19 +0100
parents b266e92bcd0b
children 574869103985
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd t
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + echo a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg add a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t test -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 + hg history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
9 tag: tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
11 date: Thu Jan 1 00:00:00 1970
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 summary: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 + hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 + hg cat a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 1 files, 1 changesets, 1 total revisions