##// END OF EJS Templates
Fixed tests for displaying tags in hg history and hg parents....
Thomas Arendsen Hein -
r388:39873777 default
parent child Browse files
Show More
@@ -1,22 +1,23 b''
1 + mkdir t
1 + mkdir t
2 + cd t
2 + cd t
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg add a
5 + hg add a
6 + hg commit -t test -u test -d '0 0'
6 + hg commit -t test -u test -d '0 0'
7 + hg history
7 + hg history
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
9 tag: tip
9 user: test
10 user: test
10 date: Thu Jan 1 00:00:00 1970
11 date: Thu Jan 1 00:00:00 1970
11 summary: test
12 summary: test
12
13
13 + hg manifest
14 + hg manifest
14 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
15 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
15 + hg cat a
16 + hg cat a
16 a
17 a
17 + hg verify
18 + hg verify
18 checking changesets
19 checking changesets
19 checking manifests
20 checking manifests
20 crosschecking files in changesets and manifests
21 crosschecking files in changesets and manifests
21 checking files
22 checking files
22 1 files, 1 changesets, 1 total revisions
23 1 files, 1 changesets, 1 total revisions
@@ -1,51 +1,52 b''
1 + hg init
1 + hg init
2 + echo a
2 + echo a
3 + hg add a
3 + hg add a
4 + hg commit -t 1 -u test -d '0 0'
4 + hg commit -t 1 -u test -d '0 0'
5 + hg status
5 + hg status
6 ? .out
6 ? .out
7 + cp a b
7 + cp a b
8 + hg copy a b
8 + hg copy a b
9 + hg status
9 + hg status
10 A b
10 A b
11 ? .out
11 ? .out
12 + hg -d commit -t 2 -u test -d '0 0'
12 + hg -d commit -t 2 -u test -d '0 0'
13 b
13 b
14 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
14 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
15 + hg history
15 + hg history
16 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
16 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
17 tag: tip
17 user: test
18 user: test
18 date: Thu Jan 1 00:00:00 1970
19 date: Thu Jan 1 00:00:00 1970
19 summary: 2
20 summary: 2
20
21
21 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
22 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
22 user: test
23 user: test
23 date: Thu Jan 1 00:00:00 1970
24 date: Thu Jan 1 00:00:00 1970
24 summary: 1
25 summary: 1
25
26
26 + hg log a
27 + hg log a
27 revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
28 revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
28 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
29 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
29 user: test
30 user: test
30 date: Thu Jan 1 00:00:00 1970
31 date: Thu Jan 1 00:00:00 1970
31 summary: 1
32 summary: 1
32
33
33 + hexdump -C .hg/data/b.d
34 + hexdump -C .hg/data/b.d
34 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
35 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
35 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
36 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
36 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b|
37 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b|
37 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a|
38 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a|
38 00000040 0a |.|
39 00000040 0a |.|
39 00000041
40 00000041
40 + hg cat b
41 + hg cat b
41 + md5sum
42 + md5sum
42 60b725f10c9c85c70d97880dfe8191b3 -
43 60b725f10c9c85c70d97880dfe8191b3 -
43 + hg cat a
44 + hg cat a
44 + md5sum
45 + md5sum
45 60b725f10c9c85c70d97880dfe8191b3 -
46 60b725f10c9c85c70d97880dfe8191b3 -
46 + hg verify
47 + hg verify
47 checking changesets
48 checking changesets
48 checking manifests
49 checking manifests
49 crosschecking files in changesets and manifests
50 crosschecking files in changesets and manifests
50 checking files
51 checking files
51 2 files, 2 changesets, 2 total revisions
52 2 files, 2 changesets, 2 total revisions
@@ -1,30 +1,31 b''
1 + mkdir t
1 + mkdir t
2 + cd t
2 + cd t
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg add a
5 + hg add a
6 + hg commit -t test -u test -d '0 0'
6 + hg commit -t test -u test -d '0 0'
7 + hg verify
7 + hg verify
8 checking changesets
8 checking changesets
9 checking manifests
9 checking manifests
10 crosschecking files in changesets and manifests
10 crosschecking files in changesets and manifests
11 checking files
11 checking files
12 1 files, 1 changesets, 1 total revisions
12 1 files, 1 changesets, 1 total revisions
13 + hg parents
13 + hg parents
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
15 tag: tip
15 user: test
16 user: test
16 date: Thu Jan 1 00:00:00 1970
17 date: Thu Jan 1 00:00:00 1970
17 summary: test
18 summary: test
18
19
19 + hg status
20 + hg status
20 + hg undo
21 + hg undo
21 attempting to rollback last transaction
22 attempting to rollback last transaction
22 + hg verify
23 + hg verify
23 checking changesets
24 checking changesets
24 checking manifests
25 checking manifests
25 crosschecking files in changesets and manifests
26 crosschecking files in changesets and manifests
26 checking files
27 checking files
27 0 files, 0 changesets, 0 total revisions
28 0 files, 0 changesets, 0 total revisions
28 + hg parents
29 + hg parents
29 + hg status
30 + hg status
30 A a
31 A a
@@ -1,70 +1,72 b''
1 + mkdir r1
1 + mkdir r1
2 + cd r1
2 + cd r1
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg addremove
5 + hg addremove
6 + hg commit -t 1 -u test -d '0 0'
6 + hg commit -t 1 -u test -d '0 0'
7 + cd ..
7 + cd ..
8 + mkdir r2
8 + mkdir r2
9 + cd r2
9 + cd r2
10 + hg init ../r1
10 + hg init ../r1
11 + hg up
11 + hg up
12 + echo abc
12 + echo abc
13 + hg diff
13 + hg diff
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
15 --- a/a
15 --- a/a
16 +++ b/a
16 +++ b/a
17 @@ -1,1 +1,1 @@
17 @@ -1,1 +1,1 @@
18 -a
18 -a
19 +abc
19 +abc
20 + cd ../r1
20 + cd ../r1
21 + echo b
21 + echo b
22 + echo a2
22 + echo a2
23 + hg addremove
23 + hg addremove
24 + hg commit -t 2 -u test -d '0 0'
24 + hg commit -t 2 -u test -d '0 0'
25 + cd ../r2
25 + cd ../r2
26 + hg -q pull ../r1
26 + hg -q pull ../r1
27 + hg status
27 + hg status
28 C a
28 C a
29 + hg -d up
29 + hg -d up
30 resolving manifests
30 resolving manifests
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
32 a versions differ, resolve
32 a versions differ, resolve
33 remote created b
33 remote created b
34 getting b
34 getting b
35 merging a
35 merging a
36 resolving a
36 resolving a
37 file a: other d730145abbf9 ancestor b789fdd96dc2
37 file a: other d730145abbf9 ancestor b789fdd96dc2
38 + hg -d up -m
38 + hg -d up -m
39 resolving manifests
39 resolving manifests
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
41 + hg parents
41 + hg parents
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
43 tag: tip
43 user: test
44 user: test
44 date: Thu Jan 1 00:00:00 1970
45 date: Thu Jan 1 00:00:00 1970
45 summary: 2
46 summary: 2
46
47
47 + hg -v history
48 + hg -v history
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
49 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
50 tag: tip
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
51 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
50 user: test
52 user: test
51 date: Thu Jan 1 00:00:00 1970
53 date: Thu Jan 1 00:00:00 1970
52 files: a b
54 files: a b
53 description:
55 description:
54 2
56 2
55
57
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
58 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
59 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
58 user: test
60 user: test
59 date: Thu Jan 1 00:00:00 1970
61 date: Thu Jan 1 00:00:00 1970
60 files: a
62 files: a
61 description:
63 description:
62 1
64 1
63
65
64 + hg diff
66 + hg diff
65 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
67 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
66 --- a/a
68 --- a/a
67 +++ b/a
69 +++ b/a
68 @@ -1,1 +1,1 @@
70 @@ -1,1 +1,1 @@
69 -a2
71 -a2
70 +abc
72 +abc
General Comments 0
You need to be logged in to leave comments. Login now