Show More
@@ -893,7 +893,7 b' table = {' | |||||
893 | [('t', 'text', "", 'commit text'), |
|
893 | [('t', 'text', "", 'commit text'), | |
894 | ('A', 'addremove', None, 'run add/remove during commit'), |
|
894 | ('A', 'addremove', None, 'run add/remove during commit'), | |
895 | ('l', 'logfile', "", 'commit text file'), |
|
895 | ('l', 'logfile', "", 'commit text file'), | |
896 |
('d', 'date', "", 'dat |
|
896 | ('d', 'date', "", 'date code'), | |
897 | ('u', 'user', "", 'user')], |
|
897 | ('u', 'user', "", 'user')], | |
898 | 'hg commit [files]'), |
|
898 | 'hg commit [files]'), | |
899 | "copy": (copy, [], 'hg copy <source> <dest>'), |
|
899 | "copy": (copy, [], 'hg copy <source> <dest>'), | |
@@ -925,7 +925,7 b' table = {' | |||||
925 | "push": (push, [], 'hg push <destination>'), |
|
925 | "push": (push, [], 'hg push <destination>'), | |
926 | "rawcommit": (rawcommit, |
|
926 | "rawcommit": (rawcommit, | |
927 | [('p', 'parent', [], 'parent'), |
|
927 | [('p', 'parent', [], 'parent'), | |
928 |
('d', 'date', "", 'dat |
|
928 | ('d', 'date', "", 'date code'), | |
929 | ('u', 'user', "", 'user'), |
|
929 | ('u', 'user', "", 'user'), | |
930 | ('F', 'files', "", 'file list'), |
|
930 | ('F', 'files', "", 'file list'), | |
931 | ('t', 'text', "", 'commit text'), |
|
931 | ('t', 'text', "", 'commit text'), | |
@@ -945,7 +945,7 b' table = {' | |||||
945 | "hg serve [options]"), |
|
945 | "hg serve [options]"), | |
946 | "status": (status, [], 'hg status'), |
|
946 | "status": (status, [], 'hg status'), | |
947 | "tag": (tag, [('t', 'text', "", 'commit text'), |
|
947 | "tag": (tag, [('t', 'text', "", 'commit text'), | |
948 | ('d', 'date', "", 'date'), |
|
948 | ('d', 'date', "", 'date code'), | |
949 | ('u', 'user', "", 'user')], |
|
949 | ('u', 'user', "", 'user')], | |
950 | 'hg tag [options] <name> [rev]'), |
|
950 | 'hg tag [options] <name> [rev]'), | |
951 | "tags": (tags, [], 'hg tags'), |
|
951 | "tags": (tags, [], 'hg tags'), | |
@@ -980,7 +980,7 b' def run():' | |||||
980 | def dispatch(args): |
|
980 | def dispatch(args): | |
981 | options = {} |
|
981 | options = {} | |
982 | opts = [('v', 'verbose', None, 'verbose'), |
|
982 | opts = [('v', 'verbose', None, 'verbose'), | |
983 |
(' |
|
983 | ('', 'debug', None, 'debug'), | |
984 | ('q', 'quiet', None, 'quiet'), |
|
984 | ('q', 'quiet', None, 'quiet'), | |
985 | ('', 'profile', None, 'profile'), |
|
985 | ('', 'profile', None, 'profile'), | |
986 | ('R', 'repository', "", 'repository root directory'), |
|
986 | ('R', 'repository', "", 'repository root directory'), |
@@ -11,7 +11,7 b' hg co 0' | |||||
11 | echo "something else" > a |
|
11 | echo "something else" > a | |
12 | hg commit -t branch2 -u test -d "0 0" |
|
12 | hg commit -t branch2 -u test -d "0 0" | |
13 | export HGMERGE=merge |
|
13 | export HGMERGE=merge | |
14 |
hg |
|
14 | hg up -m 1 | |
15 | hg id |
|
15 | hg id | |
16 | grep -Ev ">>>|<<<" a |
|
16 | grep -Ev ">>>|<<<" a | |
17 | hg status |
|
17 | hg status |
@@ -9,15 +9,9 b'' | |||||
9 | + hg commit -t branch2 -u test -d '0 0' |
|
9 | + hg commit -t branch2 -u test -d '0 0' | |
10 | + export HGMERGE=merge |
|
10 | + export HGMERGE=merge | |
11 | + HGMERGE=merge |
|
11 | + HGMERGE=merge | |
12 |
+ hg |
|
12 | + hg up -m 1 | |
13 | merge: warning: conflicts during merge |
|
13 | merge: warning: conflicts during merge | |
14 | resolving manifests |
|
|||
15 | ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc |
|
|||
16 | a versions differ, resolve |
|
|||
17 | working dir created .out, keeping |
|
|||
18 | merging a |
|
14 | merging a | |
19 | resolving a |
|
|||
20 | file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
|
|||
21 | merging a failed! |
|
15 | merging a failed! | |
22 | + hg id |
|
16 | + hg id | |
23 | 32e80765d7fe+75234512624c+ tip |
|
17 | 32e80765d7fe+75234512624c+ tip |
@@ -9,7 +9,7 b' hg status' | |||||
9 | cp a b |
|
9 | cp a b | |
10 | hg copy a b |
|
10 | hg copy a b | |
11 | hg status |
|
11 | hg status | |
12 | hg -d commit -t "2" -u test -d "0 0" |
|
12 | hg --debug commit -t "2" -u test -d "0 0" | |
13 | hg history |
|
13 | hg history | |
14 | hg log a |
|
14 | hg log a | |
15 | hexdump -C .hg/data/b.d |
|
15 | hexdump -C .hg/data/b.d |
@@ -9,7 +9,7 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 --debug 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 |
@@ -27,7 +27,7 b' hg pull ../test2' | |||||
27 | hg heads |
|
27 | hg heads | |
28 | hg history |
|
28 | hg history | |
29 |
|
29 | |||
30 |
hg - |
|
30 | hg -v co -m | |
31 |
|
31 | |||
32 | ls -l ../test[12]/a > foo |
|
32 | ls -l ../test[12]/a > foo | |
33 | cut -b 0-10 < foo |
|
33 | cut -b 0-10 < foo |
@@ -62,13 +62,10 b' user: test' | |||||
62 | date: Thu Jan 1 00:00:00 1970 |
|
62 | date: Thu Jan 1 00:00:00 1970 | |
63 | summary: added a b |
|
63 | summary: added a b | |
64 |
|
64 | |||
65 |
+ hg - |
|
65 | + hg -v co -m | |
66 | resolving manifests |
|
66 | resolving manifests | |
67 | ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e |
|
|||
68 | a versions differ, resolve |
|
|||
69 | merging a |
|
67 | merging a | |
70 | resolving a |
|
68 | resolving a | |
71 | file a: other 37c42bd6cc03 ancestor b80de5d13875 |
|
|||
72 | + ls -l ../test1/a ../test2/a |
|
69 | + ls -l ../test1/a ../test2/a | |
73 | + cut -b 0-10 |
|
70 | + cut -b 0-10 | |
74 | -rwxr-x--- |
|
71 | -rwxr-x--- |
@@ -18,4 +18,3 b' 2ed2a3912a0b24502043eae84ee4b279c18b90dd' | |||||
18 | pulling from http://localhost:20059/ |
|
18 | pulling from http://localhost:20059/ | |
19 | searching for changes |
|
19 | searching for changes | |
20 | no changes found |
|
20 | no changes found | |
21 | killed! |
|
@@ -1,33 +1,33 b'' | |||||
1 | #!/bin/sh -x |
|
1 | #!/bin/sh -x | |
2 | hg -d init |
|
2 | hg --debug init | |
3 | echo this is a1 > a |
|
3 | echo this is a1 > a | |
4 |
hg |
|
4 | hg add a | |
5 |
hg |
|
5 | hg commit -t0 -d "0 0" -u user | |
6 | echo this is b1 > b |
|
6 | echo this is b1 > b | |
7 |
hg |
|
7 | hg add b | |
8 |
hg |
|
8 | hg commit -t1 -d "0 0" -u user | |
9 |
hg |
|
9 | hg manifest 1 | |
10 | echo this is c1 > c |
|
10 | echo this is c1 > c | |
11 |
hg |
|
11 | hg rawcommit -p 1 -d "0 0" -u user -t2 c | |
12 |
hg |
|
12 | hg manifest 2 | |
13 |
hg |
|
13 | hg parents | |
14 | rm b |
|
14 | rm b | |
15 |
hg |
|
15 | hg rawcommit -p 2 -d "0 0" -u user -t3 b | |
16 |
hg |
|
16 | hg manifest 3 | |
17 |
hg |
|
17 | hg parents | |
18 | echo this is a22 > a |
|
18 | echo this is a22 > a | |
19 |
hg |
|
19 | hg rawcommit -p 3 -d "0 0" -u user -t4 a | |
20 |
hg |
|
20 | hg manifest 4 | |
21 |
hg |
|
21 | hg parents | |
22 | echo this is c22 > c |
|
22 | echo this is c22 > c | |
23 |
hg |
|
23 | hg rawcommit -p 1 -d "0 0" -u user -t5 c | |
24 |
hg |
|
24 | hg manifest 5 | |
25 |
hg |
|
25 | hg parents | |
26 | # merge, but no files changed |
|
26 | # merge, but no files changed | |
27 |
hg |
|
27 | hg rawcommit -p 4 -p 5 -d "0 0" -u user -t6 | |
28 |
hg |
|
28 | hg manifest 6 | |
29 |
hg |
|
29 | hg parents | |
30 | # no changes what-so-ever |
|
30 | # no changes what-so-ever | |
31 |
hg |
|
31 | hg rawcommit -p 6 -d "0 0" -u user -t7 | |
32 |
hg |
|
32 | hg manifest 7 | |
33 |
hg |
|
33 | hg parents |
@@ -1,117 +1,83 b'' | |||||
1 | + hg -d init |
|
1 | + hg --debug init | |
2 | + echo this is a1 |
|
2 | + echo this is a1 | |
3 |
+ hg |
|
3 | + hg add a | |
4 |
+ hg |
|
4 | + hg commit -t0 -d '0 0' -u user | |
5 | a |
|
|||
6 | + echo this is b1 |
|
5 | + echo this is b1 | |
7 |
+ hg |
|
6 | + hg add b | |
8 |
+ hg |
|
7 | + hg commit -t1 -d '0 0' -u user | |
9 | b |
|
8 | + hg manifest 1 | |
10 | + hg -d manifest 1 |
|
|||
11 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
9 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
12 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
10 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
13 | + echo this is c1 |
|
11 | + echo this is c1 | |
14 |
+ hg |
|
12 | + hg rawcommit -p 1 -d '0 0' -u user -t2 c | |
15 |
+ hg |
|
13 | + hg manifest 2 | |
16 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
14 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
17 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
15 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
18 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
16 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
19 |
+ hg |
|
17 | + hg parents | |
20 | changeset: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a |
|
18 | changeset: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a | |
21 | tag: tip |
|
19 | tag: tip | |
22 | parent: 1:3cefbe5cc27b3a068b7a6899ddff22a9874a7e69 |
|
|||
23 | parent: -1:0000000000000000000000000000000000000000 |
|
|||
24 | manifest: 2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6 |
|
|||
25 | user: user |
|
20 | user: user | |
26 | date: Thu Jan 1 00:00:00 1970 |
|
21 | date: Thu Jan 1 00:00:00 1970 | |
27 | files+: c |
|
22 | summary: 2 | |
28 | description: |
|
|||
29 | 2 |
|
|||
30 |
|
||||
31 |
|
23 | |||
32 | + rm b |
|
24 | + rm b | |
33 |
+ hg |
|
25 | + hg rawcommit -p 2 -d '0 0' -u user -t3 b | |
34 |
+ hg |
|
26 | + hg manifest 3 | |
35 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
27 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
36 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
28 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
37 |
+ hg |
|
29 | + hg parents | |
38 | changeset: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff |
|
30 | changeset: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff | |
39 | tag: tip |
|
31 | tag: tip | |
40 | parent: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a |
|
|||
41 | parent: -1:0000000000000000000000000000000000000000 |
|
|||
42 | manifest: 3:1102cb6dde652ec2ba8cc2777e464853afa67cef |
|
|||
43 | user: user |
|
32 | user: user | |
44 | date: Thu Jan 1 00:00:00 1970 |
|
33 | date: Thu Jan 1 00:00:00 1970 | |
45 | files-: b |
|
34 | summary: 3 | |
46 | description: |
|
|||
47 | 3 |
|
|||
48 |
|
||||
49 |
|
35 | |||
50 | + echo this is a22 |
|
36 | + echo this is a22 | |
51 |
+ hg |
|
37 | + hg rawcommit -p 3 -d '0 0' -u user -t4 a | |
52 |
+ hg |
|
38 | + hg manifest 4 | |
53 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
39 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
54 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
40 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
55 |
+ hg |
|
41 | + hg parents | |
56 | changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d |
|
42 | changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d | |
57 | tag: tip |
|
43 | tag: tip | |
58 | parent: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff |
|
|||
59 | parent: -1:0000000000000000000000000000000000000000 |
|
|||
60 | manifest: 4:cf4021621d6357e928385ffeee996f87c0bf991d |
|
|||
61 | user: user |
|
44 | user: user | |
62 | date: Thu Jan 1 00:00:00 1970 |
|
45 | date: Thu Jan 1 00:00:00 1970 | |
63 | files: a |
|
46 | summary: 4 | |
64 | description: |
|
|||
65 | 4 |
|
|||
66 |
|
||||
67 |
|
47 | |||
68 | + echo this is c22 |
|
48 | + echo this is c22 | |
69 |
+ hg |
|
49 | + hg rawcommit -p 1 -d '0 0' -u user -t5 c | |
70 |
+ hg |
|
50 | + hg manifest 5 | |
71 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
51 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | |
72 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
52 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
73 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
|
53 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c | |
74 |
+ hg |
|
54 | + hg parents | |
75 | changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d |
|
55 | changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d | |
76 | parent: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff |
|
|||
77 | parent: -1:0000000000000000000000000000000000000000 |
|
|||
78 | manifest: 4:cf4021621d6357e928385ffeee996f87c0bf991d |
|
|||
79 | user: user |
|
56 | user: user | |
80 | date: Thu Jan 1 00:00:00 1970 |
|
57 | date: Thu Jan 1 00:00:00 1970 | |
81 | files: a |
|
58 | summary: 4 | |
82 | description: |
|
|||
83 | 4 |
|
|||
84 |
|
59 | |||
85 |
|
60 | + hg rawcommit -p 4 -p 5 -d '0 0' -u user -t6 | ||
86 | + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6 |
|
61 | + hg manifest 6 | |
87 | + hg -d manifest 6 |
|
|||
88 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
62 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
89 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
63 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
90 |
+ hg |
|
64 | + hg parents | |
91 | changeset: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7 |
|
65 | changeset: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7 | |
92 | tag: tip |
|
66 | tag: tip | |
93 | parent: 4:2361ec7b1da5142bce1285c50f3bb2960706263d |
|
67 | parent: 4:2361ec7b1da5142bce1285c50f3bb2960706263d | |
94 | parent: 5:f8292b00383d88b470efcb2ea9c71409832ec9d6 |
|
68 | parent: 5:f8292b00383d88b470efcb2ea9c71409832ec9d6 | |
95 | manifest: 6:71c4262e09a89666ee12a92fefa12085aad53243 |
|
|||
96 | user: user |
|
69 | user: user | |
97 | date: Thu Jan 1 00:00:00 1970 |
|
70 | date: Thu Jan 1 00:00:00 1970 | |
98 | description: |
|
71 | summary: 6 | |
99 | 6 |
|
|||
100 |
|
72 | |||
101 |
|
73 | + hg rawcommit -p 6 -d '0 0' -u user -t7 | ||
102 | + hg -d rawcommit -p 6 -d '0 0' -u user -t7 |
|
74 | + hg manifest 7 | |
103 | + hg -d manifest 7 |
|
|||
104 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
75 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | |
105 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
76 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
106 |
+ hg |
|
77 | + hg parents | |
107 | changeset: 7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0 |
|
78 | changeset: 7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0 | |
108 | tag: tip |
|
79 | tag: tip | |
109 | parent: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7 |
|
|||
110 | parent: -1:0000000000000000000000000000000000000000 |
|
|||
111 | manifest: 7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2 |
|
|||
112 | user: user |
|
80 | user: user | |
113 | date: Thu Jan 1 00:00:00 1970 |
|
81 | date: Thu Jan 1 00:00:00 1970 | |
114 | description: |
|
82 | summary: 7 | |
115 | 7 |
|
|||
116 |
|
83 | |||
117 |
|
@@ -26,8 +26,8 b' hg commit -t "2" -u test -d "0 0"' | |||||
26 | cd ../r2 |
|
26 | cd ../r2 | |
27 | hg -q pull ../r1 |
|
27 | hg -q pull ../r1 | |
28 | hg status |
|
28 | hg status | |
29 | hg -d up |
|
29 | hg --debug up | |
30 | hg -d up -m |
|
30 | hg --debug up -m | |
31 | hg parents |
|
31 | hg parents | |
32 | hg -v history |
|
32 | hg -v history | |
33 | hg diff > ../d |
|
33 | hg diff > ../d |
@@ -25,7 +25,7 b' diff -r c19d34741b0a a' | |||||
25 | + hg -q pull ../r1 |
|
25 | + hg -q pull ../r1 | |
26 | + hg status |
|
26 | + hg status | |
27 | C a |
|
27 | C a | |
28 | + hg -d up |
|
28 | + hg --debug up | |
29 | resolving manifests |
|
29 | resolving manifests | |
30 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
30 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
31 | a versions differ, resolve |
|
31 | a versions differ, resolve | |
@@ -34,7 +34,7 b' getting b' | |||||
34 | merging a |
|
34 | merging a | |
35 | resolving a |
|
35 | resolving a | |
36 | file a: other d730145abbf9 ancestor b789fdd96dc2 |
|
36 | file a: other d730145abbf9 ancestor b789fdd96dc2 | |
37 | + hg -d up -m |
|
37 | + hg --debug up -m | |
38 | resolving manifests |
|
38 | resolving manifests | |
39 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
|
39 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | |
40 | + hg parents |
|
40 | + hg parents |
General Comments 0
You need to be logged in to leave comments.
Login now