Show More
@@ -11,6 +11,7 b' user: test' | |||||
11 | date: Thu Jan 1 00:00:00 1970 |
|
11 | date: Thu Jan 1 00:00:00 1970 | |
12 | summary: test |
|
12 | summary: test | |
13 |
|
13 | |||
|
14 | ||||
14 | + hg manifest |
|
15 | + hg manifest | |
15 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
|
16 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a | |
16 | + hg cat a |
|
17 | + hg cat a |
@@ -19,11 +19,13 b' user: test' | |||||
19 | date: Thu Jan 1 00:00:00 1970 |
|
19 | date: Thu Jan 1 00:00:00 1970 | |
20 | summary: 2 |
|
20 | summary: 2 | |
21 |
|
21 | |||
|
22 | ||||
22 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
23 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
23 | user: test |
|
24 | user: test | |
24 | date: Thu Jan 1 00:00:00 1970 |
|
25 | date: Thu Jan 1 00:00:00 1970 | |
25 | summary: 1 |
|
26 | summary: 1 | |
26 |
|
27 | |||
|
28 | ||||
27 | + hg log a |
|
29 | + hg log a | |
28 | revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
30 | revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
29 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
31 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
@@ -31,6 +33,7 b' user: test' | |||||
31 | date: Thu Jan 1 00:00:00 1970 |
|
33 | date: Thu Jan 1 00:00:00 1970 | |
32 | summary: 1 |
|
34 | summary: 1 | |
33 |
|
35 | |||
|
36 | ||||
34 | + hexdump -C .hg/data/b.d |
|
37 | + hexdump -C .hg/data/b.d | |
35 | 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789| |
|
38 | 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789| | |
36 | 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c| |
|
39 | 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c| |
@@ -52,16 +52,19 b' user: test' | |||||
52 | date: Thu Jan 1 00:00:00 1970 |
|
52 | date: Thu Jan 1 00:00:00 1970 | |
53 | summary: chmod +x a |
|
53 | summary: chmod +x a | |
54 |
|
54 | |||
|
55 | ||||
55 | changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
|
56 | changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | |
56 | user: test |
|
57 | user: test | |
57 | date: Thu Jan 1 00:00:00 1970 |
|
58 | date: Thu Jan 1 00:00:00 1970 | |
58 | summary: a updated |
|
59 | summary: a updated | |
59 |
|
60 | |||
|
61 | ||||
60 | changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
|
62 | changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
61 | user: test |
|
63 | user: test | |
62 | date: Thu Jan 1 00:00:00 1970 |
|
64 | date: Thu Jan 1 00:00:00 1970 | |
63 | summary: added a b |
|
65 | summary: added a b | |
64 |
|
66 | |||
|
67 | ||||
65 | + hg -v co -m |
|
68 | + hg -v co -m | |
66 | resolving manifests |
|
69 | resolving manifests | |
67 | merging a |
|
70 | merging a |
1 | NO CONTENT: modified file chmod 100644 => 100755 |
|
NO CONTENT: modified file chmod 100644 => 100755 |
@@ -7,7 +7,7 b' hg init' | |||||
7 | hg addremove |
|
7 | hg addremove | |
8 | hg commit -t "1" |
|
8 | hg commit -t "1" | |
9 | hg verify |
|
9 | hg verify | |
10 |
hg serve -p 20059 |
|
10 | hg serve -p 20059 >/dev/null 2>&1 & | |
11 | cd .. |
|
11 | cd .. | |
12 |
|
12 | |||
13 | hg clone http://localhost:20059/ copy |
|
13 | hg clone http://localhost:20059/ copy |
@@ -9,6 +9,7 b' user: test' | |||||
9 | date: Thu Jan 1 00:00:00 1970 |
|
9 | date: Thu Jan 1 00:00:00 1970 | |
10 | summary: test |
|
10 | summary: test | |
11 |
|
11 | |||
|
12 | ||||
12 | + hg tag -u test -d '0 0' bleah |
|
13 | + hg tag -u test -d '0 0' bleah | |
13 | + hg history |
|
14 | + hg history | |
14 | changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df |
|
15 | changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df | |
@@ -17,12 +18,14 b' user: test' | |||||
17 | date: Thu Jan 1 00:00:00 1970 |
|
18 | date: Thu Jan 1 00:00:00 1970 | |
18 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
19 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 | |
19 |
|
20 | |||
|
21 | ||||
20 | changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
22 | changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 | |
21 | tag: bleah |
|
23 | tag: bleah | |
22 | user: test |
|
24 | user: test | |
23 | date: Thu Jan 1 00:00:00 1970 |
|
25 | date: Thu Jan 1 00:00:00 1970 | |
24 | summary: test |
|
26 | summary: test | |
25 |
|
27 | |||
|
28 | ||||
26 | + echo foo |
|
29 | + echo foo | |
27 | + hg tag -u test -d '0 0' bleah2 |
|
30 | + hg tag -u test -d '0 0' bleah2 | |
28 | abort: working copy of .hgtags is changed! |
|
31 | abort: working copy of .hgtags is changed! |
@@ -55,6 +55,7 b' description:' | |||||
55 | 2 |
|
55 | 2 | |
56 |
|
56 | |||
57 |
|
57 | |||
|
58 | ||||
58 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
59 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
59 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
60 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
60 | user: test |
|
61 | user: test | |
@@ -64,6 +65,7 b' description:' | |||||
64 | 1 |
|
65 | 1 | |
65 |
|
66 | |||
66 |
|
67 | |||
|
68 | ||||
67 | + hg diff |
|
69 | + hg diff | |
68 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
70 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
69 | diff -r 1e71731e6fbb a |
|
71 | diff -r 1e71731e6fbb a |
General Comments 0
You need to be logged in to leave comments.
Login now