Show More
@@ -1,19 +1,31 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init |
|
3 | hg init | |
4 | echo a > a |
|
4 | echo a > a | |
5 | hg add a |
|
5 | hg add a | |
6 | hg commit -m "1" -d "0 0" |
|
6 | hg commit -m "1" -d "0 0" | |
7 | hg status |
|
7 | hg status | |
8 | cp a b |
|
8 | cp a b | |
9 | hg copy a b |
|
9 | hg copy a b | |
10 | hg status |
|
10 | hg status | |
11 | hg --debug commit -m "2" -d "0 0" |
|
11 | hg --debug commit -m "2" -d "0 0" | |
12 | hg history |
|
12 | echo "we should see two history entries" | |
|
13 | hg history -v | |||
|
14 | echo "we should see one log entry for a" | |||
13 | hg log a |
|
15 | hg log a | |
|
16 | echo "this should show a revision linked to changeset 0" | |||
|
17 | hg debugindex .hg/data/a.i | |||
|
18 | echo "we should see one log entry for b" | |||
|
19 | hg log b | |||
|
20 | echo "this should show a revision linked to changeset 1" | |||
|
21 | hg debugindex .hg/data/b.i | |||
|
22 | ||||
|
23 | echo "this should show the rename information in the metadata" | |||
|
24 | hg debugdata .hg/data/b.d 0 | head -n 3 | tail -n 2 | |||
|
25 | ||||
14 | md5sum .hg/data/b.d |
|
26 | md5sum .hg/data/b.d | |
15 | hg cat b > bsum |
|
27 | hg cat b > bsum | |
16 | md5sum bsum |
|
28 | md5sum bsum | |
17 | hg cat a > asum |
|
29 | hg cat a > asum | |
18 | md5sum asum |
|
30 | md5sum asum | |
19 | hg verify |
|
31 | hg verify |
@@ -1,27 +1,53 b'' | |||||
1 | A b |
|
1 | A b | |
2 | b |
|
2 | b | |
3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
|
4 | we should see two history entries | |||
|
5 | changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8 | |||
|
6 | tag: tip | |||
|
7 | user: test | |||
|
8 | date: Thu Jan 1 00:00:00 1970 +0000 | |||
|
9 | files: b | |||
|
10 | description: | |||
|
11 | 2 | |||
|
12 | ||||
|
13 | ||||
|
14 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |||
|
15 | user: test | |||
|
16 | date: Thu Jan 1 00:00:00 1970 +0000 | |||
|
17 | files: a | |||
|
18 | description: | |||
|
19 | 1 | |||
|
20 | ||||
|
21 | ||||
|
22 | we should see one log entry for a | |||
|
23 | filelog | |||
|
24 | changeset: 0:c19d34741b0a | |||
|
25 | user: test | |||
|
26 | date: Thu Jan 1 00:00:00 1970 +0000 | |||
|
27 | summary: 1 | |||
|
28 | ||||
|
29 | this should show a revision linked to changeset 0 | |||
|
30 | rev offset length base linkrev nodeid p1 p2 | |||
|
31 | 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 | |||
|
32 | we should see one log entry for b | |||
|
33 | filelog | |||
4 | changeset: 1:3b5b84850bbe |
|
34 | changeset: 1:3b5b84850bbe | |
5 | tag: tip |
|
35 | tag: tip | |
6 | user: test |
|
36 | user: test | |
7 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
37 | date: Thu Jan 1 00:00:00 1970 +0000 | |
8 | summary: 2 |
|
38 | summary: 2 | |
9 |
|
39 | |||
10 | changeset: 0:c19d34741b0a |
|
40 | this should show a revision linked to changeset 1 | |
11 | user: test |
|
41 | rev offset length base linkrev nodeid p1 p2 | |
12 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
42 | 0 0 65 0 1 9a263dd772e0 000000000000 000000000000 | |
13 | summary: 1 |
|
43 | this should show the rename information in the metadata | |
14 |
|
44 | copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | ||
15 | changeset: 0:c19d34741b0a |
|
45 | copy: a | |
16 | user: test |
|
|||
17 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
|||
18 | summary: 1 |
|
|||
19 |
|
||||
20 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
|
46 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d | |
21 | 60b725f10c9c85c70d97880dfe8191b3 bsum |
|
47 | 60b725f10c9c85c70d97880dfe8191b3 bsum | |
22 | 60b725f10c9c85c70d97880dfe8191b3 asum |
|
48 | 60b725f10c9c85c70d97880dfe8191b3 asum | |
23 | checking changesets |
|
49 | checking changesets | |
24 | checking manifests |
|
50 | checking manifests | |
25 | crosschecking files in changesets and manifests |
|
51 | crosschecking files in changesets and manifests | |
26 | checking files |
|
52 | checking files | |
27 | 2 files, 2 changesets, 2 total revisions |
|
53 | 2 files, 2 changesets, 2 total revisions |
@@ -1,70 +1,70 b'' | |||||
1 | creating base |
|
1 | creating base | |
2 | creating branch a |
|
2 | creating branch a | |
3 | creating branch b |
|
3 | creating branch b | |
4 | we shouldn't have anything but n state here |
|
4 | we shouldn't have anything but n state here | |
5 | n 644 2 bar |
|
5 | n 644 2 bar | |
6 | n 644 3 baz |
|
6 | n 644 3 baz | |
7 | n 644 3 foo |
|
7 | n 644 3 foo | |
8 | n 644 2 quux |
|
8 | n 644 2 quux | |
9 | merging |
|
9 | merging | |
10 | pulling from ../a |
|
10 | pulling from ../a | |
11 | searching for changes |
|
11 | searching for changes | |
12 | adding changesets |
|
12 | adding changesets | |
13 | adding manifests |
|
13 | adding manifests | |
14 | adding file changes |
|
14 | adding file changes | |
15 | added 1 changesets with 2 changes to 2 files |
|
15 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
16 | (run 'hg update' to get a working copy) |
|
16 | (run 'hg update' to get a working copy) | |
17 | merging for foo |
|
17 | merging for foo | |
18 | resolving manifests |
|
18 | resolving manifests | |
19 | getting bar |
|
19 | getting bar | |
20 | merging foo |
|
20 | merging foo | |
21 | resolving foo |
|
21 | resolving foo | |
22 | we shouldn't have anything but foo in merge state here |
|
22 | we shouldn't have anything but foo in merge state here | |
23 | m 644 3 foo |
|
23 | m 644 3 foo | |
24 | main: we should have a merge here |
|
24 | main: we should have a merge here | |
25 | rev offset length base linkrev nodeid p1 p2 |
|
25 | rev offset length base linkrev nodeid p1 p2 | |
26 | 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |
|
26 | 0 0 73 0 0 cdca01651b96 000000000000 000000000000 | |
27 | 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 |
|
27 | 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 | |
28 | 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 |
|
28 | 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 | |
29 | 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 |
|
29 | 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 | |
30 | log should show foo and quux changed |
|
30 | log should show foo and quux changed | |
31 | changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 |
|
31 | changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 | |
32 | tag: tip |
|
32 | tag: tip | |
33 | parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f |
|
33 | parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f | |
34 | parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e |
|
34 | parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e | |
35 | user: test |
|
35 | user: test | |
36 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
36 | date: Thu Jan 1 00:00:00 1970 +0000 | |
37 | files: foo quux |
|
37 | files: foo quux | |
38 | description: |
|
38 | description: | |
39 | merge |
|
39 | merge | |
40 |
|
40 | |||
41 |
|
41 | |||
42 | foo: we should have a merge here |
|
42 | foo: we should have a merge here | |
43 | rev offset length base linkrev nodeid p1 p2 |
|
43 | rev offset length base linkrev nodeid p1 p2 | |
44 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
44 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
45 | 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
|
45 | 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
46 | 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
|
46 | 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 | |
47 | 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a |
|
47 | 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a | |
48 | bar: we shouldn't have a merge here |
|
48 | bar: we shouldn't have a merge here | |
49 | rev offset length base linkrev nodeid p1 p2 |
|
49 | rev offset length base linkrev nodeid p1 p2 | |
50 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
50 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
51 | 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 |
|
51 | 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 | |
52 | baz: we shouldn't have a merge here |
|
52 | baz: we shouldn't have a merge here | |
53 | rev offset length base linkrev nodeid p1 p2 |
|
53 | rev offset length base linkrev nodeid p1 p2 | |
54 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
54 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
55 | 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
|
55 | 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
56 | quux: we shouldn't have a merge here |
|
56 | quux: we shouldn't have a merge here | |
57 | rev offset length base linkrev nodeid p1 p2 |
|
57 | rev offset length base linkrev nodeid p1 p2 | |
58 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
|
58 | 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
59 | 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
|
59 | 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 | |
60 | manifest entries should match tips of all files |
|
60 | manifest entries should match tips of all files | |
61 | 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar |
|
61 | 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar | |
62 | 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz |
|
62 | 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz | |
63 | aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo |
|
63 | aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo | |
64 | 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux |
|
64 | 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux | |
65 | everything should be clean now |
|
65 | everything should be clean now | |
66 | checking changesets |
|
66 | checking changesets | |
67 | checking manifests |
|
67 | checking manifests | |
68 | crosschecking files in changesets and manifests |
|
68 | crosschecking files in changesets and manifests | |
69 | checking files |
|
69 | checking files | |
70 | 4 files, 4 changesets, 10 total revisions |
|
70 | 4 files, 4 changesets, 10 total revisions |
@@ -1,48 +1,48 b'' | |||||
1 | pulling from ../test1 |
|
1 | pulling from ../test1 | |
2 | requesting all changes |
|
2 | requesting all changes | |
3 | adding changesets |
|
3 | adding changesets | |
4 | adding manifests |
|
4 | adding manifests | |
5 | adding file changes |
|
5 | adding file changes | |
6 | added 1 changesets with 2 changes to 2 files |
|
6 | added 1 changesets with 2 changes to 2 files | |
7 | (run 'hg update' to get a working copy) |
|
7 | (run 'hg update' to get a working copy) | |
8 | pulling from ../test2 |
|
8 | pulling from ../test2 | |
9 | searching for changes |
|
9 | searching for changes | |
10 | adding changesets |
|
10 | adding changesets | |
11 | adding manifests |
|
11 | adding manifests | |
12 | adding file changes |
|
12 | adding file changes | |
13 | added 1 changesets with 1 changes to 1 files |
|
13 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
14 | (run 'hg update' to get a working copy) |
|
14 | (run 'hg update' to get a working copy) | |
15 | changeset: 2:3ef543305655 |
|
15 | changeset: 2:3ef543305655 | |
16 | tag: tip |
|
16 | tag: tip | |
17 | parent: 0:22a449e20da5 |
|
17 | parent: 0:22a449e20da5 | |
18 | user: test |
|
18 | user: test | |
19 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
19 | date: Thu Jan 1 00:00:00 1970 +0000 | |
20 | summary: chmod +x a |
|
20 | summary: chmod +x a | |
21 |
|
21 | |||
22 | changeset: 1:c6ecefc45368 |
|
22 | changeset: 1:c6ecefc45368 | |
23 | user: test |
|
23 | user: test | |
24 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
24 | date: Thu Jan 1 00:00:00 1970 +0000 | |
25 | summary: a updated |
|
25 | summary: a updated | |
26 |
|
26 | |||
27 | changeset: 2:3ef543305655 |
|
27 | changeset: 2:3ef543305655 | |
28 | tag: tip |
|
28 | tag: tip | |
29 | parent: 0:22a449e20da5 |
|
29 | parent: 0:22a449e20da5 | |
30 | user: test |
|
30 | user: test | |
31 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
31 | date: Thu Jan 1 00:00:00 1970 +0000 | |
32 | summary: chmod +x a |
|
32 | summary: chmod +x a | |
33 |
|
33 | |||
34 | changeset: 1:c6ecefc45368 |
|
34 | changeset: 1:c6ecefc45368 | |
35 | user: test |
|
35 | user: test | |
36 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
36 | date: Thu Jan 1 00:00:00 1970 +0000 | |
37 | summary: a updated |
|
37 | summary: a updated | |
38 |
|
38 | |||
39 | changeset: 0:22a449e20da5 |
|
39 | changeset: 0:22a449e20da5 | |
40 | user: test |
|
40 | user: test | |
41 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
41 | date: Thu Jan 1 00:00:00 1970 +0000 | |
42 | summary: added a b |
|
42 | summary: added a b | |
43 |
|
43 | |||
44 | resolving manifests |
|
44 | resolving manifests | |
45 | merging a |
|
45 | merging a | |
46 | resolving a |
|
46 | resolving a | |
47 | -rwxr-x--- |
|
47 | -rwxr-x--- | |
48 | -rwxr-x--- |
|
48 | -rwxr-x--- |
@@ -1,18 +1,18 b'' | |||||
1 | pulling from ../B1 |
|
1 | pulling from ../B1 | |
2 | searching for changes |
|
2 | searching for changes | |
3 | adding changesets |
|
3 | adding changesets | |
4 | adding manifests |
|
4 | adding manifests | |
5 | adding file changes |
|
5 | adding file changes | |
6 | added 1 changesets with 1 changes to 1 files |
|
6 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
7 | (run 'hg update' to get a working copy) |
|
7 | (run 'hg update' to get a working copy) | |
8 | bar should remain deleted. |
|
8 | bar should remain deleted. | |
9 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|
9 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | |
10 | pulling from ../A2 |
|
10 | pulling from ../A2 | |
11 | searching for changes |
|
11 | searching for changes | |
12 | adding changesets |
|
12 | adding changesets | |
13 | adding manifests |
|
13 | adding manifests | |
14 | adding file changes |
|
14 | adding file changes | |
15 | added 1 changesets with 0 changes to 0 files |
|
15 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
16 | (run 'hg update' to get a working copy) |
|
16 | (run 'hg update' to get a working copy) | |
17 | bar should remain deleted. |
|
17 | bar should remain deleted. | |
18 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|
18 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
@@ -1,21 +1,21 b'' | |||||
1 | pushing to ../a |
|
1 | pushing to ../a | |
2 | searching for changes |
|
2 | searching for changes | |
3 | abort: unsynced remote changes! |
|
3 | abort: unsynced remote changes! | |
4 | (did you forget to sync? use push -f to force) |
|
4 | (did you forget to sync? use push -f to force) | |
5 | pulling from ../a |
|
5 | pulling from ../a | |
6 | searching for changes |
|
6 | searching for changes | |
7 | adding changesets |
|
7 | adding changesets | |
8 | adding manifests |
|
8 | adding manifests | |
9 | adding file changes |
|
9 | adding file changes | |
10 | added 1 changesets with 1 changes to 1 files |
|
10 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
11 | (run 'hg update' to get a working copy) |
|
11 | (run 'hg update' to get a working copy) | |
12 | pushing to ../a |
|
12 | pushing to ../a | |
13 | searching for changes |
|
13 | searching for changes | |
14 | abort: push creates new remote branches! |
|
14 | abort: push creates new remote branches! | |
15 | (did you forget to merge? use push -f to force) |
|
15 | (did you forget to merge? use push -f to force) | |
16 | pushing to ../a |
|
16 | pushing to ../a | |
17 | searching for changes |
|
17 | searching for changes | |
18 | adding changesets |
|
18 | adding changesets | |
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 2 changesets with 1 changes to 1 files |
|
21 | added 2 changesets with 1 changes to 1 files |
@@ -1,19 +1,19 b'' | |||||
1 | pulling from ../a |
|
1 | pulling from ../a | |
2 | searching for changes |
|
2 | searching for changes | |
3 | warning: pulling from an unrelated repository! |
|
3 | warning: pulling from an unrelated repository! | |
4 | adding changesets |
|
4 | adding changesets | |
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 1 changesets with 1 changes to 1 files |
|
7 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
8 | (run 'hg update' to get a working copy) |
|
8 | (run 'hg update' to get a working copy) | |
9 | changeset: 1:9a79c33a9db3 |
|
9 | changeset: 1:9a79c33a9db3 | |
10 | tag: tip |
|
10 | tag: tip | |
11 | user: a |
|
11 | user: a | |
12 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
12 | date: Thu Jan 1 00:00:00 1970 +0000 | |
13 | summary: a |
|
13 | summary: a | |
14 |
|
14 | |||
15 | changeset: 0:01f8062b2de5 |
|
15 | changeset: 0:01f8062b2de5 | |
16 | user: b |
|
16 | user: b | |
17 | date: Thu Jan 1 00:00:00 1970 +0000 |
|
17 | date: Thu Jan 1 00:00:00 1970 +0000 | |
18 | summary: b |
|
18 | summary: b | |
19 |
|
19 |
General Comments 0
You need to be logged in to leave comments.
Login now