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