Show More
@@ -243,6 +243,7 b' def clone(ui, source, dest=None, pull=Fa' | |||||
243 | fp.close() |
|
243 | fp.close() | |
244 |
|
244 | |||
245 | if update: |
|
245 | if update: | |
|
246 | dest_repo.ui.status(_("updating working directory\n")) | |||
246 | if not checkout: |
|
247 | if not checkout: | |
247 | try: |
|
248 | try: | |
248 | checkout = dest_repo.lookup("default") |
|
249 | checkout = dest_repo.lookup("default") |
@@ -4,6 +4,7 b' adding changesets' | |||||
4 | adding manifests |
|
4 | adding manifests | |
5 | adding file changes |
|
5 | adding file changes | |
6 | added 1 changesets with 3 changes to 3 files |
|
6 | added 1 changesets with 3 changes to 3 files | |
|
7 | updating working directory | |||
7 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 |
|
9 | |||
9 | Extension disabled for lack of a hook |
|
10 | Extension disabled for lack of a hook |
@@ -163,6 +163,7 b' 4 changesets found' | |||||
163 | 6 changesets found |
|
163 | 6 changesets found | |
164 | 1 changesets found |
|
164 | 1 changesets found | |
165 | 1 changesets found |
|
165 | 1 changesets found | |
|
166 | updating working directory | |||
166 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 | % 2 |
|
168 | % 2 | |
168 | 2:d62976ca1e50 |
|
169 | 2:d62976ca1e50 | |
@@ -218,6 +219,7 b' warning: detected divergent renames of a' | |||||
218 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
219 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
219 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
220 | 7 changesets found |
|
221 | 7 changesets found | |
|
222 | updating working directory | |||
221 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
222 | adding changesets |
|
224 | adding changesets | |
223 | adding manifests |
|
225 | adding manifests |
@@ -146,7 +146,9 b' adding changesets' | |||||
146 | adding manifests |
|
146 | adding manifests | |
147 | adding file changes |
|
147 | adding file changes | |
148 | added 4 changesets with 4 changes to 1 files |
|
148 | added 4 changesets with 4 changes to 1 files | |
|
149 | updating working directory | |||
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
151 | updating working directory | |||
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 | ====== Log -R full.hg in partial |
|
153 | ====== Log -R full.hg in partial | |
152 | changeset: 8:836ac62537ab |
|
154 | changeset: 8:836ac62537ab | |
@@ -267,6 +269,7 b' adding changesets' | |||||
267 | adding manifests |
|
269 | adding manifests | |
268 | adding file changes |
|
270 | adding file changes | |
269 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
271 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
272 | updating working directory | |||
270 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
273 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
271 | changeset: 8:836ac62537ab |
|
274 | changeset: 8:836ac62537ab | |
272 | tag: tip |
|
275 | tag: tip | |
@@ -293,6 +296,7 b' adding file changes' | |||||
293 | added 1 changesets with 1 changes to 1 files |
|
296 | added 1 changesets with 1 changes to 1 files | |
294 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
295 | ====== test for 540d1059c802 |
|
298 | ====== test for 540d1059c802 | |
|
299 | updating working directory | |||
296 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
300 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
297 | searching for changes |
|
301 | searching for changes | |
298 | 1 changesets found |
|
302 | 1 changesets found |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pulling from ../source |
|
3 | pulling from ../source | |
3 | transaction abort! |
|
4 | transaction abort! |
@@ -30,6 +30,7 b' adding changesets' | |||||
30 | adding manifests |
|
30 | adding manifests | |
31 | adding file changes |
|
31 | adding file changes | |
32 | added 1 changesets with 1 changes to 1 files |
|
32 | added 1 changesets with 1 changes to 1 files | |
|
33 | updating working directory | |||
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | checking changesets |
|
35 | checking changesets | |
35 | checking manifests |
|
36 | checking manifests | |
@@ -41,6 +42,7 b' adding changesets' | |||||
41 | adding manifests |
|
42 | adding manifests | |
42 | adding file changes |
|
43 | adding file changes | |
43 | added 2 changesets with 2 changes to 1 files |
|
44 | added 2 changesets with 2 changes to 1 files | |
|
45 | updating working directory | |||
44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
45 | checking changesets |
|
47 | checking changesets | |
46 | checking manifests |
|
48 | checking manifests | |
@@ -52,6 +54,7 b' adding changesets' | |||||
52 | adding manifests |
|
54 | adding manifests | |
53 | adding file changes |
|
55 | adding file changes | |
54 | added 3 changesets with 3 changes to 1 files |
|
56 | added 3 changesets with 3 changes to 1 files | |
|
57 | updating working directory | |||
55 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
56 | checking changesets |
|
59 | checking changesets | |
57 | checking manifests |
|
60 | checking manifests | |
@@ -63,6 +66,7 b' adding changesets' | |||||
63 | adding manifests |
|
66 | adding manifests | |
64 | adding file changes |
|
67 | adding file changes | |
65 | added 4 changesets with 4 changes to 1 files |
|
68 | added 4 changesets with 4 changes to 1 files | |
|
69 | updating working directory | |||
66 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
67 | checking changesets |
|
71 | checking changesets | |
68 | checking manifests |
|
72 | checking manifests | |
@@ -74,6 +78,7 b' adding changesets' | |||||
74 | adding manifests |
|
78 | adding manifests | |
75 | adding file changes |
|
79 | adding file changes | |
76 | added 2 changesets with 2 changes to 1 files |
|
80 | added 2 changesets with 2 changes to 1 files | |
|
81 | updating working directory | |||
77 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | checking changesets |
|
83 | checking changesets | |
79 | checking manifests |
|
84 | checking manifests | |
@@ -85,6 +90,7 b' adding changesets' | |||||
85 | adding manifests |
|
90 | adding manifests | |
86 | adding file changes |
|
91 | adding file changes | |
87 | added 3 changesets with 3 changes to 1 files |
|
92 | added 3 changesets with 3 changes to 1 files | |
|
93 | updating working directory | |||
88 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
89 | checking changesets |
|
95 | checking changesets | |
90 | checking manifests |
|
96 | checking manifests | |
@@ -96,6 +102,7 b' adding changesets' | |||||
96 | adding manifests |
|
102 | adding manifests | |
97 | adding file changes |
|
103 | adding file changes | |
98 | added 4 changesets with 5 changes to 2 files |
|
104 | added 4 changesets with 5 changes to 2 files | |
|
105 | updating working directory | |||
99 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
100 | checking changesets |
|
107 | checking changesets | |
101 | checking manifests |
|
108 | checking manifests | |
@@ -107,6 +114,7 b' adding changesets' | |||||
107 | adding manifests |
|
114 | adding manifests | |
108 | adding file changes |
|
115 | adding file changes | |
109 | added 5 changesets with 6 changes to 3 files |
|
116 | added 5 changesets with 6 changes to 3 files | |
|
117 | updating working directory | |||
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
118 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 | checking changesets |
|
119 | checking changesets | |
112 | checking manifests |
|
120 | checking manifests | |
@@ -118,6 +126,7 b' adding changesets' | |||||
118 | adding manifests |
|
126 | adding manifests | |
119 | adding file changes |
|
127 | adding file changes | |
120 | added 5 changesets with 5 changes to 2 files |
|
128 | added 5 changesets with 5 changes to 2 files | |
|
129 | updating working directory | |||
121 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | checking changesets |
|
131 | checking changesets | |
123 | checking manifests |
|
132 | checking manifests |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | a |
|
3 | a | |
3 | checking changesets |
|
4 | checking changesets | |
@@ -12,7 +13,9 b' crosschecking files in changesets and ma' | |||||
12 | checking files |
|
13 | checking files | |
13 | 1 files, 1 changesets, 1 total revisions |
|
14 | 1 files, 1 changesets, 1 total revisions | |
14 | destination directory: a |
|
15 | destination directory: a | |
|
16 | updating working directory | |||
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 | a |
|
18 | a | |
|
19 | updating working directory | |||
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | a#0 |
|
21 | a#0 |
@@ -19,6 +19,7 b' scanning source...' | |||||
19 | sorting... |
|
19 | sorting... | |
20 | converting... |
|
20 | converting... | |
21 | % new hg rev |
|
21 | % new hg rev | |
|
22 | updating working directory | |||
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | % echo hg to svn |
|
24 | % echo hg to svn | |
24 | scanning source... |
|
25 | scanning source... |
@@ -1,5 +1,7 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
4 | updating working directory | |||
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | % push should push to default when default-push not set |
|
6 | % push should push to default when default-push not set | |
5 | pushing |
|
7 | pushing |
@@ -16,12 +16,14 b' adding changesets' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 4 changesets with 3 changes to 3 files |
|
18 | added 4 changesets with 3 changes to 3 files | |
|
19 | updating working directory | |||
19 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 | requesting all changes |
|
21 | requesting all changes | |
21 | adding changesets |
|
22 | adding changesets | |
22 | adding manifests |
|
23 | adding manifests | |
23 | adding file changes |
|
24 | adding file changes | |
24 | added 4 changesets with 3 changes to 3 files |
|
25 | added 4 changesets with 3 changes to 3 files | |
|
26 | updating working directory | |||
25 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 | comparing with b |
|
28 | comparing with b | |
27 | searching for changes |
|
29 | searching for changes |
@@ -9,6 +9,7 b' reposetup called for a' | |||||
9 | ui == repo.ui |
|
9 | ui == repo.ui | |
10 | reposetup called for b |
|
10 | reposetup called for b | |
11 | ui == repo.ui |
|
11 | ui == repo.ui | |
|
12 | updating working directory | |||
12 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | uisetup called |
|
14 | uisetup called | |
14 | ui.parentui is None |
|
15 | ui.parentui is None |
@@ -1,5 +1,7 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
4 | updating working directory | |||
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | adding b |
|
6 | adding b | |
5 | 1:97d72e5f12c7 |
|
7 | 1:97d72e5f12c7 | |
@@ -13,7 +15,9 b' added 1 changesets with 1 changes to 1 f' | |||||
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | 1:97d72e5f12c7 |
|
16 | 1:97d72e5f12c7 | |
15 | adding c |
|
17 | adding c | |
|
18 | updating working directory | |||
16 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
20 | updating working directory | |||
17 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | % should merge c into a |
|
22 | % should merge c into a | |
19 | pulling from ../a |
|
23 | pulling from ../a | |
@@ -56,7 +60,9 b' merging with 1:5e056962225c' | |||||
56 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
57 | new changeset 3:... merges remote changes with local |
|
61 | new changeset 3:... merges remote changes with local | |
58 | Automated merge with http://localhost:20059/ |
|
62 | Automated merge with http://localhost:20059/ | |
|
63 | updating working directory | |||
59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
65 | updating working directory | |||
60 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
61 | adding f |
|
67 | adding f | |
62 | adding g |
|
68 | adding g |
@@ -1,4 +1,5 b'' | |||||
1 | creating base |
|
1 | creating base | |
|
2 | updating working directory | |||
2 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | creating branch a |
|
4 | creating branch a | |
4 | creating branch b |
|
5 | creating branch b |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pulling from ../test1 |
|
3 | pulling from ../test1 | |
3 | requesting all changes |
|
4 | requesting all changes |
@@ -1,5 +1,6 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | adding b |
|
2 | adding b | |
|
3 | updating working directory | |||
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | pulling from ../b |
|
5 | pulling from ../b | |
5 | searching for changes |
|
6 | searching for changes |
@@ -3,6 +3,7 b' pretxncommit hook: HG_NODE=29b62aeb769fd' | |||||
3 | 0:29b62aeb769f |
|
3 | 0:29b62aeb769f | |
4 | commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 |
|
4 | commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 | |
5 | commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 |
|
5 | commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 | |
|
6 | updating working directory | |||
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
8 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b | |
8 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
9 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
@@ -33,6 +33,7 b' adding changesets' | |||||
33 | adding manifests |
|
33 | adding manifests | |
34 | adding file changes |
|
34 | adding file changes | |
35 | added 1 changesets with 1 changes to 1 files |
|
35 | added 1 changesets with 1 changes to 1 files | |
|
36 | updating working directory | |||
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 | checking changesets |
|
38 | checking changesets | |
38 | checking manifests |
|
39 | checking manifests | |
@@ -44,6 +45,7 b' adding changesets' | |||||
44 | adding manifests |
|
45 | adding manifests | |
45 | adding file changes |
|
46 | adding file changes | |
46 | added 2 changesets with 2 changes to 1 files |
|
47 | added 2 changesets with 2 changes to 1 files | |
|
48 | updating working directory | |||
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | checking changesets |
|
50 | checking changesets | |
49 | checking manifests |
|
51 | checking manifests | |
@@ -55,6 +57,7 b' adding changesets' | |||||
55 | adding manifests |
|
57 | adding manifests | |
56 | adding file changes |
|
58 | adding file changes | |
57 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
|
60 | updating working directory | |||
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | checking changesets |
|
62 | checking changesets | |
60 | checking manifests |
|
63 | checking manifests | |
@@ -66,6 +69,7 b' adding changesets' | |||||
66 | adding manifests |
|
69 | adding manifests | |
67 | adding file changes |
|
70 | adding file changes | |
68 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
|
72 | updating working directory | |||
69 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
70 | checking changesets |
|
74 | checking changesets | |
71 | checking manifests |
|
75 | checking manifests | |
@@ -77,6 +81,7 b' adding changesets' | |||||
77 | adding manifests |
|
81 | adding manifests | |
78 | adding file changes |
|
82 | adding file changes | |
79 | added 2 changesets with 2 changes to 1 files |
|
83 | added 2 changesets with 2 changes to 1 files | |
|
84 | updating working directory | |||
80 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
81 | checking changesets |
|
86 | checking changesets | |
82 | checking manifests |
|
87 | checking manifests | |
@@ -88,6 +93,7 b' adding changesets' | |||||
88 | adding manifests |
|
93 | adding manifests | |
89 | adding file changes |
|
94 | adding file changes | |
90 | added 3 changesets with 3 changes to 1 files |
|
95 | added 3 changesets with 3 changes to 1 files | |
|
96 | updating working directory | |||
91 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
92 | checking changesets |
|
98 | checking changesets | |
93 | checking manifests |
|
99 | checking manifests | |
@@ -99,6 +105,7 b' adding changesets' | |||||
99 | adding manifests |
|
105 | adding manifests | |
100 | adding file changes |
|
106 | adding file changes | |
101 | added 4 changesets with 5 changes to 2 files |
|
107 | added 4 changesets with 5 changes to 2 files | |
|
108 | updating working directory | |||
102 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
103 | checking changesets |
|
110 | checking changesets | |
104 | checking manifests |
|
111 | checking manifests | |
@@ -110,6 +117,7 b' adding changesets' | |||||
110 | adding manifests |
|
117 | adding manifests | |
111 | adding file changes |
|
118 | adding file changes | |
112 | added 5 changesets with 6 changes to 3 files |
|
119 | added 5 changesets with 6 changes to 3 files | |
|
120 | updating working directory | |||
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 | checking changesets |
|
122 | checking changesets | |
115 | checking manifests |
|
123 | checking manifests | |
@@ -121,6 +129,7 b' adding changesets' | |||||
121 | adding manifests |
|
129 | adding manifests | |
122 | adding file changes |
|
130 | adding file changes | |
123 | added 5 changesets with 5 changes to 2 files |
|
131 | added 5 changesets with 5 changes to 2 files | |
|
132 | updating working directory | |||
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | checking changesets |
|
134 | checking changesets | |
126 | checking manifests |
|
135 | checking manifests |
@@ -3,6 +3,7 b' adding a' | |||||
3 | streaming all changes |
|
3 | streaming all changes | |
4 | XXX files to transfer, XXX bytes of data |
|
4 | XXX files to transfer, XXX bytes of data | |
5 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
5 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
|
6 | updating working directory | |||
6 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
7 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
7 | checking changesets |
|
8 | checking changesets | |
8 | checking manifests |
|
9 | checking manifests | |
@@ -15,6 +16,7 b' adding changesets' | |||||
15 | adding manifests |
|
16 | adding manifests | |
16 | adding file changes |
|
17 | adding file changes | |
17 | added 1 changesets with 1 changes to 1 files |
|
18 | added 1 changesets with 1 changes to 1 files | |
|
19 | updating working directory | |||
18 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
19 | checking changesets |
|
21 | checking changesets | |
20 | checking manifests |
|
22 | checking manifests | |
@@ -27,6 +29,7 b' adding changesets' | |||||
27 | adding manifests |
|
29 | adding manifests | |
28 | adding file changes |
|
30 | adding file changes | |
29 | added 1 changesets with 1 changes to 1 files |
|
31 | added 1 changesets with 1 changes to 1 files | |
|
32 | updating working directory | |||
30 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | %% proxy url with user name and password |
|
34 | %% proxy url with user name and password | |
32 | requesting all changes |
|
35 | requesting all changes | |
@@ -34,6 +37,7 b' adding changesets' | |||||
34 | adding manifests |
|
37 | adding manifests | |
35 | adding file changes |
|
38 | adding file changes | |
36 | added 1 changesets with 1 changes to 1 files |
|
39 | added 1 changesets with 1 changes to 1 files | |
|
40 | updating working directory | |||
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
38 | %% url with user name and password |
|
42 | %% url with user name and password | |
39 | requesting all changes |
|
43 | requesting all changes | |
@@ -41,6 +45,7 b' adding changesets' | |||||
41 | adding manifests |
|
45 | adding manifests | |
42 | adding file changes |
|
46 | adding file changes | |
43 | added 1 changesets with 1 changes to 1 files |
|
47 | added 1 changesets with 1 changes to 1 files | |
|
48 | updating working directory | |||
44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
45 | %% bad host:port for proxy |
|
50 | %% bad host:port for proxy | |
46 | abort: error: Connection refused |
|
51 | abort: error: Connection refused |
@@ -4,6 +4,7 b" abort: cannot start server at ':20060':" | |||||
4 | streaming all changes |
|
4 | streaming all changes | |
5 | XXX files to transfer, XXX bytes of data |
|
5 | XXX files to transfer, XXX bytes of data | |
6 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
6 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
|
7 | updating working directory | |||
7 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
8 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
8 | checking changesets |
|
9 | checking changesets | |
9 | checking manifests |
|
10 | checking manifests | |
@@ -16,6 +17,7 b' adding changesets' | |||||
16 | adding manifests |
|
17 | adding manifests | |
17 | adding file changes |
|
18 | adding file changes | |
18 | added 1 changesets with 1 changes to 1 files |
|
19 | added 1 changesets with 1 changes to 1 files | |
|
20 | updating working directory | |||
19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 | % clone via pull |
|
22 | % clone via pull | |
21 | requesting all changes |
|
23 | requesting all changes | |
@@ -23,6 +25,7 b' adding changesets' | |||||
23 | adding manifests |
|
25 | adding manifests | |
24 | adding file changes |
|
26 | adding file changes | |
25 | added 1 changesets with 1 changes to 1 files |
|
27 | added 1 changesets with 1 changes to 1 files | |
|
28 | updating working directory | |||
26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 | checking changesets |
|
30 | checking changesets | |
28 | checking manifests |
|
31 | checking manifests |
@@ -6,6 +6,7 b' adding changesets' | |||||
6 | adding manifests |
|
6 | adding manifests | |
7 | adding file changes |
|
7 | adding file changes | |
8 | added 1 changesets with 2 changes to 2 files |
|
8 | added 1 changesets with 2 changes to 2 files | |
|
9 | updating working directory | |||
9 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | applying ../tip.patch |
|
11 | applying ../tip.patch | |
11 | % message should be same |
|
12 | % message should be same | |
@@ -18,6 +19,7 b' adding changesets' | |||||
18 | adding manifests |
|
19 | adding manifests | |
19 | adding file changes |
|
20 | adding file changes | |
20 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
|
22 | updating working directory | |||
21 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 | applying ../tip.patch |
|
24 | applying ../tip.patch | |
23 | transaction abort! |
|
25 | transaction abort! | |
@@ -29,6 +31,7 b' adding changesets' | |||||
29 | adding manifests |
|
31 | adding manifests | |
30 | adding file changes |
|
32 | adding file changes | |
31 | added 1 changesets with 2 changes to 2 files |
|
33 | added 1 changesets with 2 changes to 2 files | |
|
34 | updating working directory | |||
32 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | applying ../tip.patch |
|
36 | applying ../tip.patch | |
34 | % import of plain diff with specific date and user |
|
37 | % import of plain diff with specific date and user | |
@@ -37,6 +40,7 b' adding changesets' | |||||
37 | adding manifests |
|
40 | adding manifests | |
38 | adding file changes |
|
41 | adding file changes | |
39 | added 1 changesets with 2 changes to 2 files |
|
42 | added 1 changesets with 2 changes to 2 files | |
|
43 | updating working directory | |||
40 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
41 | applying ../tip.patch |
|
45 | applying ../tip.patch | |
42 | changeset: 1:ca68f19f3a40 |
|
46 | changeset: 1:ca68f19f3a40 | |
@@ -61,6 +65,7 b' adding changesets' | |||||
61 | adding manifests |
|
65 | adding manifests | |
62 | adding file changes |
|
66 | adding file changes | |
63 | added 1 changesets with 2 changes to 2 files |
|
67 | added 1 changesets with 2 changes to 2 files | |
|
68 | updating working directory | |||
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | applying ../tip.patch |
|
70 | applying ../tip.patch | |
66 | diff -r 80971e65b431 a |
|
71 | diff -r 80971e65b431 a | |
@@ -75,6 +80,7 b' adding changesets' | |||||
75 | adding manifests |
|
80 | adding manifests | |
76 | adding file changes |
|
81 | adding file changes | |
77 | added 1 changesets with 2 changes to 2 files |
|
82 | added 1 changesets with 2 changes to 2 files | |
|
83 | updating working directory | |||
78 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 | applying tip.patch |
|
85 | applying tip.patch | |
80 | % import from stdin |
|
86 | % import from stdin | |
@@ -83,6 +89,7 b' adding changesets' | |||||
83 | adding manifests |
|
89 | adding manifests | |
84 | adding file changes |
|
90 | adding file changes | |
85 | added 1 changesets with 2 changes to 2 files |
|
91 | added 1 changesets with 2 changes to 2 files | |
|
92 | updating working directory | |||
86 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 | applying patch from stdin |
|
94 | applying patch from stdin | |
88 | % override commit message |
|
95 | % override commit message | |
@@ -91,6 +98,7 b' adding changesets' | |||||
91 | adding manifests |
|
98 | adding manifests | |
92 | adding file changes |
|
99 | adding file changes | |
93 | added 1 changesets with 2 changes to 2 files |
|
100 | added 1 changesets with 2 changes to 2 files | |
|
101 | updating working directory | |||
94 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
102 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
95 | applying patch from stdin |
|
103 | applying patch from stdin | |
96 | summary: override |
|
104 | summary: override | |
@@ -100,6 +108,7 b' adding changesets' | |||||
100 | adding manifests |
|
108 | adding manifests | |
101 | adding file changes |
|
109 | adding file changes | |
102 | added 1 changesets with 2 changes to 2 files |
|
110 | added 1 changesets with 2 changes to 2 files | |
|
111 | updating working directory | |||
103 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
104 | applying ../msg.patch |
|
113 | applying ../msg.patch | |
105 | user: email patcher |
|
114 | user: email patcher | |
@@ -110,6 +119,7 b' adding changesets' | |||||
110 | adding manifests |
|
119 | adding manifests | |
111 | adding file changes |
|
120 | adding file changes | |
112 | added 1 changesets with 2 changes to 2 files |
|
121 | added 1 changesets with 2 changes to 2 files | |
|
122 | updating working directory | |||
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
123 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 | applying patch from stdin |
|
124 | applying patch from stdin | |
115 | % plain diff in email, subject, no message body |
|
125 | % plain diff in email, subject, no message body | |
@@ -118,6 +128,7 b' adding changesets' | |||||
118 | adding manifests |
|
128 | adding manifests | |
119 | adding file changes |
|
129 | adding file changes | |
120 | added 1 changesets with 2 changes to 2 files |
|
130 | added 1 changesets with 2 changes to 2 files | |
|
131 | updating working directory | |||
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | applying patch from stdin |
|
133 | applying patch from stdin | |
123 | % plain diff in email, no subject, no message body, should fail |
|
134 | % plain diff in email, no subject, no message body, should fail | |
@@ -126,6 +137,7 b' adding changesets' | |||||
126 | adding manifests |
|
137 | adding manifests | |
127 | adding file changes |
|
138 | adding file changes | |
128 | added 1 changesets with 2 changes to 2 files |
|
139 | added 1 changesets with 2 changes to 2 files | |
|
140 | updating working directory | |||
129 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
141 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
130 | applying patch from stdin |
|
142 | applying patch from stdin | |
131 | transaction abort! |
|
143 | transaction abort! | |
@@ -137,6 +149,7 b' adding changesets' | |||||
137 | adding manifests |
|
149 | adding manifests | |
138 | adding file changes |
|
150 | adding file changes | |
139 | added 1 changesets with 2 changes to 2 files |
|
151 | added 1 changesets with 2 changes to 2 files | |
|
152 | updating working directory | |||
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
153 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
141 | applying patch from stdin |
|
154 | applying patch from stdin | |
142 | summary: second change |
|
155 | summary: second change | |
@@ -146,6 +159,7 b' adding changesets' | |||||
146 | adding manifests |
|
159 | adding manifests | |
147 | adding file changes |
|
160 | adding file changes | |
148 | added 1 changesets with 2 changes to 2 files |
|
161 | added 1 changesets with 2 changes to 2 files | |
|
162 | updating working directory | |||
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | applying patch from stdin |
|
164 | applying patch from stdin | |
151 | email patch |
|
165 | email patch | |
@@ -164,6 +178,7 b' adding changesets' | |||||
164 | adding manifests |
|
178 | adding manifests | |
165 | adding file changes |
|
179 | adding file changes | |
166 | added 1 changesets with 2 changes to 2 files |
|
180 | added 1 changesets with 2 changes to 2 files | |
|
181 | updating working directory | |||
167 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
182 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
168 | applying ../../../tip.patch |
|
183 | applying ../../../tip.patch | |
169 | % message should be 'subdir change' |
|
184 | % message should be 'subdir change' |
@@ -279,6 +279,7 b' user: test' | |||||
279 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
279 | date: Mon Jan 12 13:46:40 1970 +0000 | |
280 | summary: 8 |
|
280 | summary: 8 | |
281 |
|
281 | |||
|
282 | updating working directory | |||
282 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
283 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
283 | checking changesets |
|
284 | checking changesets | |
284 | checking manifests |
|
285 | checking manifests |
@@ -312,6 +312,7 b' adding changesets' | |||||
312 | adding manifests |
|
312 | adding manifests | |
313 | adding file changes |
|
313 | adding file changes | |
314 | added 2 changesets with 3 changes to 3 files |
|
314 | added 2 changesets with 3 changes to 3 files | |
|
315 | updating working directory | |||
315 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
316 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
316 | % incoming |
|
317 | % incoming | |
317 | comparing with test-keyword/Test |
|
318 | comparing with test-keyword/Test |
@@ -1,4 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | adding b |
|
4 | adding b | |
4 | pushing to ../a |
|
5 | pushing to ../a |
@@ -2,6 +2,7 b'' | |||||
2 | % create alpha in first repo |
|
2 | % create alpha in first repo | |
3 | adding alpha |
|
3 | adding alpha | |
4 | % clone foo-base to foo-work |
|
4 | % clone foo-base to foo-work | |
|
5 | updating working directory | |||
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 | % create beta in second repo |
|
7 | % create beta in second repo | |
7 | adding beta |
|
8 | adding beta |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pulling from ../a |
|
3 | pulling from ../a | |
3 | searching for changes |
|
4 | searching for changes |
@@ -1,5 +1,8 b'' | |||||
|
1 | updating working directory | |||
1 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
3 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
5 | updating working directory | |||
3 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | pulling from ../B1 |
|
7 | pulling from ../B1 | |
5 | searching for changes |
|
8 | searching for changes |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pulling from ../test-a |
|
3 | pulling from ../test-a | |
3 | searching for changes |
|
4 | searching for changes |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pulling from ../a |
|
3 | pulling from ../a | |
3 | searching for changes |
|
4 | searching for changes |
@@ -17,6 +17,7 b' Patch queue now empty' | |||||
17 | ====== Bundle queue |
|
17 | ====== Bundle queue | |
18 | 1 changesets found |
|
18 | 1 changesets found | |
19 | ====== Clone base |
|
19 | ====== Clone base | |
|
20 | updating working directory | |||
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 | ====== Incoming queue bundle |
|
22 | ====== Incoming queue bundle | |
22 | >> hg -R .hg/patches incoming ../queue.hgq |
|
23 | >> hg -R .hg/patches incoming ../queue.hgq | |
@@ -39,6 +40,7 b' 0: queue: two.patch added.' | |||||
39 | >> hg qseries |
|
40 | >> hg qseries | |
40 | two.patch |
|
41 | two.patch | |
41 | ====== Clone base again |
|
42 | ====== Clone base again | |
|
43 | updating working directory | |||
42 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
43 | ====== Unbundle queue bundle |
|
45 | ====== Unbundle queue bundle | |
44 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
|
46 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
@@ -19,6 +19,7 b' adding changesets' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 3 changes to 3 files |
|
21 | added 1 changesets with 3 changes to 3 files | |
|
22 | updating working directory | |||
22 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 | a |
|
25 | a |
@@ -52,6 +52,7 b' list of commands:' | |||||
52 |
|
52 | |||
53 | use "hg -v help mq" to show aliases and global options |
|
53 | use "hg -v help mq" to show aliases and global options | |
54 | adding a |
|
54 | adding a | |
|
55 | updating working directory | |||
55 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
56 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
56 | adding b/z |
|
57 | adding b/z | |
57 | % qinit |
|
58 | % qinit | |
@@ -457,6 +458,7 b' main repo:' | |||||
457 | rev 0: add foo |
|
458 | rev 0: add foo | |
458 | patch repo: |
|
459 | patch repo: | |
459 | rev 0: checkpoint |
|
460 | rev 0: checkpoint | |
|
461 | updating working directory | |||
460 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
462 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
461 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
462 | main repo: |
|
464 | main repo: | |
@@ -468,6 +470,7 b' main repo:' | |||||
468 | rev 0: add foo |
|
470 | rev 0: add foo | |
469 | patch repo: |
|
471 | patch repo: | |
470 | rev 0: checkpoint |
|
472 | rev 0: checkpoint | |
|
473 | updating working directory | |||
471 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
474 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
472 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
475 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
473 | main repo: |
|
476 | main repo: |
@@ -4,6 +4,7 b' no commands defined' | |||||
4 | % commit |
|
4 | % commit | |
5 | adding a |
|
5 | adding a | |
6 | % clone |
|
6 | % clone | |
|
7 | updating working directory | |||
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | % commit |
|
9 | % commit | |
9 | % pull (minimal config) |
|
10 | % pull (minimal config) |
@@ -5,6 +5,7 b' 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 | |
|
8 | updating working directory | |||
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | applying ../a.diff |
|
10 | applying ../a.diff | |
10 | Using custom patch |
|
11 | Using custom patch |
@@ -1,1 +1,2 b'' | |||||
|
1 | updating working directory | |||
1 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -3,6 +3,7 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 1 changes to 1 files |
|
5 | added 1 changesets with 1 changes to 1 files | |
|
6 | updating working directory | |||
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | checking changesets |
|
8 | checking changesets | |
8 | checking manifests |
|
9 | checking manifests |
@@ -3,6 +3,7 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 1 changes to 1 files |
|
5 | added 1 changesets with 1 changes to 1 files | |
|
6 | updating working directory | |||
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | pulling from ../source2 |
|
8 | pulling from ../source2 | |
8 | pulling from ../source1 |
|
9 | pulling from ../source1 |
@@ -1,4 +1,5 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | % should fail |
|
4 | % should fail | |
4 | pulling from ../tt |
|
5 | pulling from ../tt |
@@ -9,6 +9,7 b' adding changesets' | |||||
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 1 changesets with 1 changes to 1 files |
|
11 | added 1 changesets with 1 changes to 1 files | |
|
12 | updating working directory | |||
12 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | checking changesets |
|
14 | checking changesets | |
14 | checking manifests |
|
15 | checking manifests |
@@ -1,5 +1,7 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
4 | updating working directory | |||
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | pushing to ../2 |
|
6 | pushing to ../2 | |
5 | searching for changes |
|
7 | searching for changes |
@@ -1,4 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | % expect ssl error |
|
4 | % expect ssl error | |
4 | pushing to http://localhost/ |
|
5 | pushing to http://localhost/ |
@@ -1,3 +1,4 b'' | |||||
|
1 | updating working directory | |||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pushing to ../a |
|
3 | pushing to ../a | |
3 | searching for changes |
|
4 | searching for changes | |
@@ -23,6 +24,7 b' adding manifests' | |||||
23 | adding file changes |
|
24 | adding file changes | |
24 | added 2 changesets with 1 changes to 1 files |
|
25 | added 2 changesets with 1 changes to 1 files | |
25 | adding foo |
|
26 | adding foo | |
|
27 | updating working directory | |||
26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | created new head |
|
30 | created new head |
@@ -63,4 +63,5 b' R b' | |||||
63 | removing c/d |
|
63 | removing c/d | |
64 | R b |
|
64 | R b | |
65 | R c/d |
|
65 | R c/d | |
|
66 | updating working directory | |||
66 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,6 +1,7 b'' | |||||
1 | % create source repository |
|
1 | % create source repository | |
2 | adding a |
|
2 | adding a | |
3 | % fork source repository |
|
3 | % fork source repository | |
|
4 | updating working directory | |||
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | adding b |
|
6 | adding b | |
6 | % update source repository |
|
7 | % update source repository |
@@ -1,4 +1,5 b'' | |||||
1 | adding a/f |
|
1 | adding a/f | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | moving a/f to b/f |
|
4 | moving a/f to b/f | |
4 | adding a/aa/g |
|
5 | adding a/aa/g |
@@ -4,6 +4,7 b' checking manifests' | |||||
4 | crosschecking files in changesets and manifests |
|
4 | crosschecking files in changesets and manifests | |
5 | checking files |
|
5 | checking files | |
6 | 1 files, 1 changesets, 1 total revisions |
|
6 | 1 files, 1 changesets, 1 total revisions | |
|
7 | updating working directory | |||
7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | pulling from ../branch |
|
10 | pulling from ../branch |
@@ -32,6 +32,7 b' adding changesets' | |||||
32 | adding manifests |
|
32 | adding manifests | |
33 | adding file changes |
|
33 | adding file changes | |
34 | added 1 changesets with 1 changes to 1 files |
|
34 | added 1 changesets with 1 changes to 1 files | |
|
35 | updating working directory | |||
35 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 | checking changesets |
|
37 | checking changesets | |
37 | checking manifests |
|
38 | checking manifests | |
@@ -43,6 +44,7 b' adding changesets' | |||||
43 | adding manifests |
|
44 | adding manifests | |
44 | adding file changes |
|
45 | adding file changes | |
45 | added 2 changesets with 2 changes to 1 files |
|
46 | added 2 changesets with 2 changes to 1 files | |
|
47 | updating working directory | |||
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 | checking changesets |
|
49 | checking changesets | |
48 | checking manifests |
|
50 | checking manifests | |
@@ -54,6 +56,7 b' adding changesets' | |||||
54 | adding manifests |
|
56 | adding manifests | |
55 | adding file changes |
|
57 | adding file changes | |
56 | added 3 changesets with 3 changes to 1 files |
|
58 | added 3 changesets with 3 changes to 1 files | |
|
59 | updating working directory | |||
57 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
58 | checking changesets |
|
61 | checking changesets | |
59 | checking manifests |
|
62 | checking manifests | |
@@ -65,6 +68,7 b' adding changesets' | |||||
65 | adding manifests |
|
68 | adding manifests | |
66 | adding file changes |
|
69 | adding file changes | |
67 | added 4 changesets with 4 changes to 1 files |
|
70 | added 4 changesets with 4 changes to 1 files | |
|
71 | updating working directory | |||
68 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
69 | checking changesets |
|
73 | checking changesets | |
70 | checking manifests |
|
74 | checking manifests | |
@@ -76,6 +80,7 b' adding changesets' | |||||
76 | adding manifests |
|
80 | adding manifests | |
77 | adding file changes |
|
81 | adding file changes | |
78 | added 2 changesets with 2 changes to 1 files |
|
82 | added 2 changesets with 2 changes to 1 files | |
|
83 | updating working directory | |||
79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 | checking changesets |
|
85 | checking changesets | |
81 | checking manifests |
|
86 | checking manifests | |
@@ -87,6 +92,7 b' adding changesets' | |||||
87 | adding manifests |
|
92 | adding manifests | |
88 | adding file changes |
|
93 | adding file changes | |
89 | added 3 changesets with 3 changes to 1 files |
|
94 | added 3 changesets with 3 changes to 1 files | |
|
95 | updating working directory | |||
90 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 | checking changesets |
|
97 | checking changesets | |
92 | checking manifests |
|
98 | checking manifests | |
@@ -98,6 +104,7 b' adding changesets' | |||||
98 | adding manifests |
|
104 | adding manifests | |
99 | adding file changes |
|
105 | adding file changes | |
100 | added 4 changesets with 5 changes to 2 files |
|
106 | added 4 changesets with 5 changes to 2 files | |
|
107 | updating working directory | |||
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 | checking changesets |
|
109 | checking changesets | |
103 | checking manifests |
|
110 | checking manifests | |
@@ -109,6 +116,7 b' adding changesets' | |||||
109 | adding manifests |
|
116 | adding manifests | |
110 | adding file changes |
|
117 | adding file changes | |
111 | added 5 changesets with 6 changes to 3 files |
|
118 | added 5 changesets with 6 changes to 3 files | |
|
119 | updating working directory | |||
112 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
113 | checking changesets |
|
121 | checking changesets | |
114 | checking manifests |
|
122 | checking manifests | |
@@ -120,6 +128,7 b' adding changesets' | |||||
120 | adding manifests |
|
128 | adding manifests | |
121 | adding file changes |
|
129 | adding file changes | |
122 | added 5 changesets with 5 changes to 2 files |
|
130 | added 5 changesets with 5 changes to 2 files | |
|
131 | updating working directory | |||
123 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
124 | checking changesets |
|
133 | checking changesets | |
125 | checking manifests |
|
134 | checking manifests |
@@ -6,6 +6,7 b' abort: no suitable response from remote ' | |||||
6 | streaming all changes |
|
6 | streaming all changes | |
7 | XXX files to transfer, XXX bytes of data |
|
7 | XXX files to transfer, XXX bytes of data | |
8 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
8 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
|
9 | updating working directory | |||
9 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
10 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
10 | checking changesets |
|
11 | checking changesets | |
11 | checking manifests |
|
12 | checking manifests | |
@@ -18,6 +19,7 b' adding changesets' | |||||
18 | adding manifests |
|
19 | adding manifests | |
19 | adding file changes |
|
20 | adding file changes | |
20 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
|
22 | updating working directory | |||
21 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 | # verify |
|
24 | # verify | |
23 | checking changesets |
|
25 | checking changesets |
@@ -12,6 +12,7 b' adding changesets' | |||||
12 | adding manifests |
|
12 | adding manifests | |
13 | adding file changes |
|
13 | adding file changes | |
14 | added 1 changesets with 1 changes to 1 files |
|
14 | added 1 changesets with 1 changes to 1 files | |
|
15 | updating working directory | |||
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 | checking changesets |
|
17 | checking changesets | |
17 | checking manifests |
|
18 | checking manifests | |
@@ -34,6 +35,7 b' adding changesets' | |||||
34 | adding manifests |
|
35 | adding manifests | |
35 | adding file changes |
|
36 | adding file changes | |
36 | added 1 changesets with 1 changes to 1 files |
|
37 | added 1 changesets with 1 changes to 1 files | |
|
38 | updating working directory | |||
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
39 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
38 | checking changesets |
|
40 | checking changesets | |
39 | checking manifests |
|
41 | checking manifests | |
@@ -44,6 +46,7 b' a' | |||||
44 | default = static-http://localhost/ |
|
46 | default = static-http://localhost/ | |
45 | % test with empty repo (issue965) |
|
47 | % test with empty repo (issue965) | |
46 | no changes found |
|
48 | no changes found | |
|
49 | updating working directory | |||
47 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | checking changesets |
|
51 | checking changesets | |
49 | checking manifests |
|
52 | checking manifests |
@@ -19,6 +19,7 b' 1. commit a symlink' | |||||
19 | ? a/b/c/demo |
|
19 | ? a/b/c/demo | |
20 | adding a/b/c/demo |
|
20 | adding a/b/c/demo | |
21 | 2. clone it |
|
21 | 2. clone it | |
|
22 | updating working directory | |||
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | # git symlink diff |
|
24 | # git symlink diff | |
24 | diff --git a/a/b/c/demo b/a/b/c/demo |
|
25 | diff --git a/a/b/c/demo b/a/b/c/demo |
@@ -10,6 +10,7 b' 3 b2' | |||||
10 | 2 0:17ab29e464c6 b1 |
|
10 | 2 0:17ab29e464c6 b1 | |
11 | 1 r2 |
|
11 | 1 r2 | |
12 | 0 r1 |
|
12 | 0 r1 | |
|
13 | updating working directory | |||
13 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
15 | % rebase b onto r1 |
|
16 | % rebase b onto r1 | |
@@ -27,6 +28,7 b' 3 b2' | |||||
27 | 2 0:17ab29e464c6 b1 |
|
28 | 2 0:17ab29e464c6 b1 | |
28 | 1 r2 |
|
29 | 1 r2 | |
29 | 0 r1 |
|
30 | 0 r1 | |
|
31 | updating working directory | |||
30 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
32 | % rebase b onto r1, skipping b2 |
|
34 | % rebase b onto r1, skipping b2 | |
@@ -47,6 +49,7 b' adding changesets' | |||||
47 | adding manifests |
|
49 | adding manifests | |
48 | adding file changes |
|
50 | adding file changes | |
49 | added 2 changesets with 2 changes to 2 files |
|
51 | added 2 changesets with 2 changes to 2 files | |
|
52 | updating working directory | |||
50 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
53 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | searching for changes |
|
54 | searching for changes | |
52 | applying 37a1297eb21b |
|
55 | applying 37a1297eb21b | |
@@ -72,6 +75,7 b' 1 r2' | |||||
72 | 0 r1 |
|
75 | 0 r1 | |
73 | % skip local changes transplanted to the source |
|
76 | % skip local changes transplanted to the source | |
74 | adding b4 |
|
77 | adding b4 | |
|
78 | updating working directory | |||
75 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | searching for changes |
|
80 | searching for changes | |
77 | applying 4333daefcb15 |
|
81 | applying 4333daefcb15 | |
@@ -82,6 +86,7 b' adding changesets' | |||||
82 | adding manifests |
|
86 | adding manifests | |
83 | adding file changes |
|
87 | adding file changes | |
84 | added 1 changesets with 1 changes to 1 files |
|
88 | added 1 changesets with 1 changes to 1 files | |
|
89 | updating working directory | |||
85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
86 | searching for changes |
|
91 | searching for changes | |
87 | searching for changes |
|
92 | searching for changes |
@@ -1,4 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | updating working directory | |||
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | diff -r 33aaa84a386b a |
|
5 | diff -r 33aaa84a386b a |
@@ -5,6 +5,7 b' adding changesets' | |||||
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 2 changesets with 2 changes to 1 files |
|
7 | added 2 changesets with 2 changes to 1 files | |
|
8 | updating working directory | |||
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | % heads |
|
10 | % heads | |
10 | changeset: 1:cd2a86ecc814 |
|
11 | changeset: 1:cd2a86ecc814 |
General Comments 0
You need to be logged in to leave comments.
Login now