Mercurial > hg

annotate tests/test-basic.out @ 5503:6f26c7677463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 02 Nov 2007 14:02:28 -0700
parents 8feb33c2d153
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
1 changeset: 0:0acdaf898367
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
2 tag: tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
4 date: Mon Jan 12 13:46:40 1970 +0000
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 summary: test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 2152
diff changeset
7 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 1 files, 1 changesets, 1 total revisions