Show More
@@ -307,7 +307,6 b' def clone(ui, source, dest=None, pull=Fa' | |||||
307 | dest_repo.ui.setconfig('paths', 'default', abspath) |
|
307 | dest_repo.ui.setconfig('paths', 'default', abspath) | |
308 |
|
308 | |||
309 | if update: |
|
309 | if update: | |
310 | dest_repo.ui.status(_("updating working directory\n")) |
|
|||
311 | if update is not True: |
|
310 | if update is not True: | |
312 | checkout = update |
|
311 | checkout = update | |
313 | for test in (checkout, 'default', 'tip'): |
|
312 | for test in (checkout, 'default', 'tip'): | |
@@ -318,6 +317,8 b' def clone(ui, source, dest=None, pull=Fa' | |||||
318 | break |
|
317 | break | |
319 | except error.RepoLookupError: |
|
318 | except error.RepoLookupError: | |
320 | continue |
|
319 | continue | |
|
320 | bn = dest_repo[uprev].branch() | |||
|
321 | dest_repo.ui.status(_("updating to branch %s\n") % bn) | |||
321 | _update(dest_repo, uprev) |
|
322 | _update(dest_repo, uprev) | |
322 |
|
323 | |||
323 | return src_repo, dest_repo |
|
324 | return src_repo, dest_repo |
@@ -4,7 +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 |
|
7 | updating to branch default | |
8 | 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 | |
9 |
|
9 | |||
10 | Extension disabled for lack of a hook |
|
10 | Extension disabled for lack of a hook |
@@ -163,7 +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 |
|
166 | updating to branch default | |
167 | 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 | |
168 | % 2 |
|
168 | % 2 | |
169 | 2:d62976ca1e50 |
|
169 | 2:d62976ca1e50 | |
@@ -219,7 +219,7 b' warning: detected divergent renames of a' | |||||
219 | 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 | |
220 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
221 | 7 changesets found |
|
221 | 7 changesets found | |
222 |
updating |
|
222 | updating to branch default | |
223 | 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 | |
224 | adding changesets |
|
224 | adding changesets | |
225 | adding manifests |
|
225 | adding manifests |
@@ -146,9 +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 |
|
149 | updating to branch default | |
150 | 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 |
|
151 | updating to branch default | |
152 | 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 | |
153 | ====== Log -R full.hg in partial |
|
153 | ====== Log -R full.hg in partial | |
154 | changeset: 8:836ac62537ab |
|
154 | changeset: 8:836ac62537ab | |
@@ -269,7 +269,7 b' adding changesets' | |||||
269 | adding manifests |
|
269 | adding manifests | |
270 | adding file changes |
|
270 | adding file changes | |
271 | 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 |
|
272 | updating to branch default | |
273 | 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 | |
274 | changeset: 8:836ac62537ab |
|
274 | changeset: 8:836ac62537ab | |
275 | tag: tip |
|
275 | tag: tip | |
@@ -296,7 +296,7 b' adding file changes' | |||||
296 | added 1 changesets with 1 changes to 1 files |
|
296 | added 1 changesets with 1 changes to 1 files | |
297 | 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 | |
298 | ====== test for 540d1059c802 |
|
298 | ====== test for 540d1059c802 | |
299 |
updating |
|
299 | updating to branch default | |
300 | 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 | |
301 | searching for changes |
|
301 | searching for changes | |
302 | 1 changesets found |
|
302 | 1 changesets found |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | |
3 | pulling from ../source |
|
3 | pulling from ../source | |
4 | transaction abort! |
|
4 | transaction abort! |
@@ -30,7 +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 |
|
33 | updating to branch default | |
34 | 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 | |
35 | checking changesets |
|
35 | checking changesets | |
36 | checking manifests |
|
36 | checking manifests | |
@@ -42,7 +42,7 b' adding changesets' | |||||
42 | adding manifests |
|
42 | adding manifests | |
43 | adding file changes |
|
43 | adding file changes | |
44 | added 2 changesets with 2 changes to 1 files |
|
44 | added 2 changesets with 2 changes to 1 files | |
45 |
updating |
|
45 | updating to branch default | |
46 | 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 | |
47 | checking changesets |
|
47 | checking changesets | |
48 | checking manifests |
|
48 | checking manifests | |
@@ -54,7 +54,7 b' adding changesets' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 3 changesets with 3 changes to 1 files |
|
56 | added 3 changesets with 3 changes to 1 files | |
57 |
updating |
|
57 | updating to branch default | |
58 | 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 | |
59 | checking changesets |
|
59 | checking changesets | |
60 | checking manifests |
|
60 | checking manifests | |
@@ -66,7 +66,7 b' adding changesets' | |||||
66 | adding manifests |
|
66 | adding manifests | |
67 | adding file changes |
|
67 | adding file changes | |
68 | added 4 changesets with 4 changes to 1 files |
|
68 | added 4 changesets with 4 changes to 1 files | |
69 |
updating |
|
69 | updating to branch default | |
70 | 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 | |
71 | checking changesets |
|
71 | checking changesets | |
72 | checking manifests |
|
72 | checking manifests | |
@@ -78,7 +78,7 b' adding changesets' | |||||
78 | adding manifests |
|
78 | adding manifests | |
79 | adding file changes |
|
79 | adding file changes | |
80 | added 2 changesets with 2 changes to 1 files |
|
80 | added 2 changesets with 2 changes to 1 files | |
81 |
updating |
|
81 | updating to branch default | |
82 | 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 | |
83 | checking changesets |
|
83 | checking changesets | |
84 | checking manifests |
|
84 | checking manifests | |
@@ -90,7 +90,7 b' adding changesets' | |||||
90 | adding manifests |
|
90 | adding manifests | |
91 | adding file changes |
|
91 | adding file changes | |
92 | added 3 changesets with 3 changes to 1 files |
|
92 | added 3 changesets with 3 changes to 1 files | |
93 |
updating |
|
93 | updating to branch default | |
94 | 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 | |
95 | checking changesets |
|
95 | checking changesets | |
96 | checking manifests |
|
96 | checking manifests | |
@@ -102,7 +102,7 b' adding changesets' | |||||
102 | adding manifests |
|
102 | adding manifests | |
103 | adding file changes |
|
103 | adding file changes | |
104 | added 4 changesets with 5 changes to 2 files |
|
104 | added 4 changesets with 5 changes to 2 files | |
105 |
updating |
|
105 | updating to branch default | |
106 | 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 | |
107 | checking changesets |
|
107 | checking changesets | |
108 | checking manifests |
|
108 | checking manifests | |
@@ -114,7 +114,7 b' adding changesets' | |||||
114 | adding manifests |
|
114 | adding manifests | |
115 | adding file changes |
|
115 | adding file changes | |
116 | added 5 changesets with 6 changes to 3 files |
|
116 | added 5 changesets with 6 changes to 3 files | |
117 |
updating |
|
117 | updating to branch default | |
118 | 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 | |
119 | checking changesets |
|
119 | checking changesets | |
120 | checking manifests |
|
120 | checking manifests | |
@@ -126,7 +126,7 b' adding changesets' | |||||
126 | adding manifests |
|
126 | adding manifests | |
127 | adding file changes |
|
127 | adding file changes | |
128 | added 5 changesets with 5 changes to 2 files |
|
128 | added 5 changesets with 5 changes to 2 files | |
129 |
updating |
|
129 | updating to branch default | |
130 | 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 | |
131 | checking changesets |
|
131 | checking changesets | |
132 | checking manifests |
|
132 | checking manifests |
@@ -6,7 +6,7 b'' | |||||
6 | .hg/store/data/b.i |
|
6 | .hg/store/data/b.i | |
7 |
|
7 | |||
8 | % default operation |
|
8 | % default operation | |
9 |
updating |
|
9 | updating to branch default | |
10 | 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 | |
11 | a |
|
11 | a | |
12 | checking changesets |
|
12 | checking changesets | |
@@ -25,13 +25,13 b' 2 files, 11 changesets, 11 total revisio' | |||||
25 |
|
25 | |||
26 | % default destination |
|
26 | % default destination | |
27 | destination directory: a |
|
27 | destination directory: a | |
28 |
updating |
|
28 | updating to branch default | |
29 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 | a |
|
30 | a | |
31 |
|
31 | |||
32 | % check that we drop the file:// from the path before |
|
32 | % check that we drop the file:// from the path before | |
33 | % writing the .hgrc |
|
33 | % writing the .hgrc | |
34 |
updating |
|
34 | updating to branch default | |
35 | 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 | |
36 |
|
36 | |||
37 | % check that path aliases are expanded |
|
37 | % check that path aliases are expanded | |
@@ -43,7 +43,7 b' adding changesets' | |||||
43 | adding manifests |
|
43 | adding manifests | |
44 | adding file changes |
|
44 | adding file changes | |
45 | added 11 changesets with 11 changes to 2 files |
|
45 | added 11 changesets with 11 changes to 2 files | |
46 |
updating |
|
46 | updating to branch default | |
47 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | checking changesets |
|
48 | checking changesets | |
49 | checking manifests |
|
49 | checking manifests | |
@@ -52,5 +52,5 b' checking files' | |||||
52 | 2 files, 11 changesets, 11 total revisions |
|
52 | 2 files, 11 changesets, 11 total revisions | |
53 |
|
53 | |||
54 | % clone to . |
|
54 | % clone to . | |
55 |
updating |
|
55 | updating to branch default | |
56 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
56 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -7,7 +7,7 b' adding e' | |||||
7 | % test invalid splicemap |
|
7 | % test invalid splicemap | |
8 | abort: syntax error in splicemap(1): key/value pair expected |
|
8 | abort: syntax error in splicemap(1): key/value pair expected | |
9 | % splice repo2 on repo1 |
|
9 | % splice repo2 on repo1 | |
10 |
updating |
|
10 | updating to branch default | |
11 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | scanning source... |
|
12 | scanning source... | |
13 | sorting... |
|
13 | sorting... |
@@ -1,7 +1,7 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 |
|
4 | updating to branch default | |
5 | 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 | |
6 | % push should push to default when default-push not set |
|
6 | % push should push to default when default-push not set | |
7 | pushing |
|
7 | pushing |
@@ -16,14 +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 |
|
19 | updating to branch default | |
20 | 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 | |
21 | requesting all changes |
|
21 | requesting all changes | |
22 | adding changesets |
|
22 | adding changesets | |
23 | adding manifests |
|
23 | adding manifests | |
24 | adding file changes |
|
24 | adding file changes | |
25 | added 4 changesets with 3 changes to 3 files |
|
25 | added 4 changesets with 3 changes to 3 files | |
26 |
updating |
|
26 | updating to branch default | |
27 | 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 | |
28 | comparing with b |
|
28 | comparing with b | |
29 | searching for changes |
|
29 | searching for changes |
@@ -6,7 +6,7 b' 0 files, 0 changesets, 0 total revisions' | |||||
6 | 00changelog.i |
|
6 | 00changelog.i | |
7 | requires |
|
7 | requires | |
8 | store |
|
8 | store | |
9 |
updating |
|
9 | updating to branch default | |
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | checking changesets |
|
11 | checking changesets | |
12 | checking manifests |
|
12 | checking manifests |
@@ -7,7 +7,7 b' reposetup called for a' | |||||
7 | ui == repo.ui |
|
7 | ui == repo.ui | |
8 | reposetup called for b |
|
8 | reposetup called for b | |
9 | ui == repo.ui |
|
9 | ui == repo.ui | |
10 |
updating |
|
10 | updating to branch default | |
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | uisetup called |
|
12 | uisetup called | |
13 | Bar |
|
13 | Bar |
@@ -1,8 +1,8 b'' | |||||
1 | % test fetch with default branches only |
|
1 | % test fetch with default branches only | |
2 | adding a |
|
2 | adding a | |
3 |
updating |
|
3 | updating to branch default | |
4 | 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 |
|
5 | updating to branch default | |
6 | 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 | |
7 | adding b |
|
7 | adding b | |
8 | 1:97d72e5f12c7 |
|
8 | 1:97d72e5f12c7 | |
@@ -16,9 +16,9 b' added 1 changesets with 1 changes to 1 f' | |||||
16 | 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 | |
17 | 1:97d72e5f12c7 |
|
17 | 1:97d72e5f12c7 | |
18 | adding c |
|
18 | adding c | |
19 |
updating |
|
19 | updating to branch default | |
20 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 |
updating |
|
21 | updating to branch default | |
22 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | % should merge c into a |
|
23 | % should merge c into a | |
24 | pulling from ../a |
|
24 | pulling from ../a | |
@@ -61,9 +61,9 b' merging with 1:5e056962225c' | |||||
61 | 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 | |
62 | new changeset 3:... merges remote changes with local |
|
62 | new changeset 3:... merges remote changes with local | |
63 | Automated merge with http://localhost:20059/ |
|
63 | Automated merge with http://localhost:20059/ | |
64 |
updating |
|
64 | updating to branch default | |
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 |
updating |
|
66 | updating to branch default | |
67 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
68 | adding f |
|
68 | adding f | |
69 | adding g |
|
69 | adding g | |
@@ -89,9 +89,9 b' adding b' | |||||
89 | created new head |
|
89 | created new head | |
90 |
|
90 | |||
91 | % pull in change on foreign branch |
|
91 | % pull in change on foreign branch | |
92 |
updating |
|
92 | updating to branch default | |
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 |
updating |
|
94 | updating to branch default | |
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 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 |
|
96 | 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 |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -105,9 +105,9 b' added 1 changesets with 1 changes to 1 f' | |||||
105 | 2 |
|
105 | 2 | |
106 |
|
106 | |||
107 | % pull in changes on both foreign and local branches |
|
107 | % pull in changes on both foreign and local branches | |
108 |
updating |
|
108 | updating to branch default | |
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 |
updating |
|
110 | updating to branch default | |
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -124,9 +124,9 b' 4' | |||||
124 |
|
124 | |||
125 | % pull changes on foreign (2 new heads) and local (1 new head) branches |
|
125 | % pull changes on foreign (2 new heads) and local (1 new head) branches | |
126 | % with a local change |
|
126 | % with a local change | |
127 |
updating |
|
127 | updating to branch default | |
128 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
128 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 |
updating |
|
129 | updating to branch default | |
130 | 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 | |
131 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 | 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 | |
@@ -149,9 +149,9 b' new changeset 7:48f1a33f52af merges remo' | |||||
149 | 7 |
|
149 | 7 | |
150 | % pull in changes on foreign (merge of local branch) and local (2 new |
|
150 | % pull in changes on foreign (merge of local branch) and local (2 new | |
151 | % heads) with a local change |
|
151 | % heads) with a local change | |
152 |
updating |
|
152 | updating to branch default | |
153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
154 |
updating |
|
154 | updating to branch default | |
155 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
156 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
156 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
157 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -172,7 +172,7 b' not merging with 1 other new branch head' | |||||
172 | 3 |
|
172 | 3 | |
173 | % pull in change on different branch than dirstate |
|
173 | % pull in change on different branch than dirstate | |
174 | adding a |
|
174 | adding a | |
175 |
updating |
|
175 | updating to branch default | |
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
177 | marked working directory as branch topic |
|
177 | marked working directory as branch topic | |
178 | abort: working dir not at branch tip (use "hg update" to check out branch tip) |
|
178 | abort: working dir not at branch tip (use "hg update" to check out branch tip) | |
@@ -184,7 +184,7 b' marked working directory as branch secon' | |||||
184 | adding b |
|
184 | adding b | |
185 | marked working directory as branch default |
|
185 | marked working directory as branch default | |
186 | adding c |
|
186 | adding c | |
187 |
updating |
|
187 | updating to branch default | |
188 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
189 | % fetch should succeed |
|
189 | % fetch should succeed | |
190 | pulling from ../ib1 |
|
190 | pulling from ../ib1 | |
@@ -192,7 +192,7 b' searching for changes' | |||||
192 | no changes found |
|
192 | no changes found | |
193 | % test issue1726 |
|
193 | % test issue1726 | |
194 | adding a |
|
194 | adding a | |
195 |
updating |
|
195 | updating to branch default | |
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
197 | pulling from ../i1726r1 |
|
197 | pulling from ../i1726r1 | |
198 | searching for changes |
|
198 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | creating base |
|
1 | creating base | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | |
4 | creating branch a |
|
4 | creating branch a | |
5 | creating branch b |
|
5 | creating branch b |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | pulling from ../test1 |
|
3 | pulling from ../test1 | |
4 | requesting all changes |
|
4 | requesting all changes |
@@ -1,6 +1,6 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | adding b |
|
2 | adding b | |
3 |
updating |
|
3 | updating to branch default | |
4 | 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 | pulling from ../b |
|
5 | pulling from ../b | |
6 | searching for changes |
|
6 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | hg: config error at .../t/.hg/hgrc:1: 'invalid' |
|
1 | hg: config error at .../t/.hg/hgrc:1: 'invalid' | |
2 |
updating |
|
2 | updating to branch default | |
3 | 0 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 | [paths] |
|
4 | [paths] | |
5 | default = .../foo%bar |
|
5 | default = .../foo%bar |
@@ -3,7 +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 |
|
6 | updating to branch default | |
7 | 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 | |
8 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
8 | precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b | |
9 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a |
|
9 | pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a | |
@@ -109,7 +109,7 b' searching for changes' | |||||
109 | abort: preoutgoing.forbid hook exited with status 1 |
|
109 | abort: preoutgoing.forbid hook exited with status 1 | |
110 | preoutgoing hook: HG_SOURCE=clone |
|
110 | preoutgoing hook: HG_SOURCE=clone | |
111 | outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone |
|
111 | outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone | |
112 |
updating |
|
112 | updating to branch default | |
113 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 | preoutgoing hook: HG_SOURCE=clone |
|
114 | preoutgoing hook: HG_SOURCE=clone | |
115 | preoutgoing.forbid hook: HG_SOURCE=clone |
|
115 | preoutgoing.forbid hook: HG_SOURCE=clone |
@@ -33,7 +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 |
|
36 | updating to branch default | |
37 | 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 | |
38 | checking changesets |
|
38 | checking changesets | |
39 | checking manifests |
|
39 | checking manifests | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 2 changesets with 2 changes to 1 files |
|
47 | added 2 changesets with 2 changes to 1 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 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 | |
50 | checking changesets |
|
50 | checking changesets | |
51 | checking manifests |
|
51 | checking manifests | |
@@ -57,7 +57,7 b' adding changesets' | |||||
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
60 |
updating |
|
60 | updating to branch default | |
61 | 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 | |
62 | checking changesets |
|
62 | checking changesets | |
63 | checking manifests |
|
63 | checking manifests | |
@@ -69,7 +69,7 b' adding changesets' | |||||
69 | adding manifests |
|
69 | adding manifests | |
70 | adding file changes |
|
70 | adding file changes | |
71 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
72 |
updating |
|
72 | updating to branch default | |
73 | 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 | |
74 | checking changesets |
|
74 | checking changesets | |
75 | checking manifests |
|
75 | checking manifests | |
@@ -81,7 +81,7 b' adding changesets' | |||||
81 | adding manifests |
|
81 | adding manifests | |
82 | adding file changes |
|
82 | adding file changes | |
83 | added 2 changesets with 2 changes to 1 files |
|
83 | added 2 changesets with 2 changes to 1 files | |
84 |
updating |
|
84 | updating to branch default | |
85 | 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 | |
86 | checking changesets |
|
86 | checking changesets | |
87 | checking manifests |
|
87 | checking manifests | |
@@ -93,7 +93,7 b' adding changesets' | |||||
93 | adding manifests |
|
93 | adding manifests | |
94 | adding file changes |
|
94 | adding file changes | |
95 | added 3 changesets with 3 changes to 1 files |
|
95 | added 3 changesets with 3 changes to 1 files | |
96 |
updating |
|
96 | updating to branch default | |
97 | 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 | |
98 | checking changesets |
|
98 | checking changesets | |
99 | checking manifests |
|
99 | checking manifests | |
@@ -105,7 +105,7 b' adding changesets' | |||||
105 | adding manifests |
|
105 | adding manifests | |
106 | adding file changes |
|
106 | adding file changes | |
107 | added 4 changesets with 5 changes to 2 files |
|
107 | added 4 changesets with 5 changes to 2 files | |
108 |
updating |
|
108 | updating to branch default | |
109 | 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 | |
110 | checking changesets |
|
110 | checking changesets | |
111 | checking manifests |
|
111 | checking manifests | |
@@ -117,7 +117,7 b' adding changesets' | |||||
117 | adding manifests |
|
117 | adding manifests | |
118 | adding file changes |
|
118 | adding file changes | |
119 | added 5 changesets with 6 changes to 3 files |
|
119 | added 5 changesets with 6 changes to 3 files | |
120 |
updating |
|
120 | updating to branch default | |
121 | 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 | |
122 | checking changesets |
|
122 | checking changesets | |
123 | checking manifests |
|
123 | checking manifests | |
@@ -129,7 +129,7 b' adding changesets' | |||||
129 | adding manifests |
|
129 | adding manifests | |
130 | adding file changes |
|
130 | adding file changes | |
131 | added 5 changesets with 5 changes to 2 files |
|
131 | added 5 changesets with 5 changes to 2 files | |
132 |
updating |
|
132 | updating to branch default | |
133 | 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 | |
134 | checking changesets |
|
134 | checking changesets | |
135 | checking manifests |
|
135 | checking manifests |
@@ -3,7 +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 |
|
6 | updating to branch default | |
7 | 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 | |
8 | checking changesets |
|
8 | checking changesets | |
9 | checking manifests |
|
9 | checking manifests | |
@@ -16,7 +16,7 b' adding changesets' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 1 changesets with 1 changes to 1 files |
|
18 | added 1 changesets with 1 changes to 1 files | |
19 |
updating |
|
19 | updating to branch default | |
20 | 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 | |
21 | checking changesets |
|
21 | checking changesets | |
22 | checking manifests |
|
22 | checking manifests | |
@@ -29,7 +29,7 b' adding changesets' | |||||
29 | adding manifests |
|
29 | adding manifests | |
30 | adding file changes |
|
30 | adding file changes | |
31 | added 1 changesets with 1 changes to 1 files |
|
31 | added 1 changesets with 1 changes to 1 files | |
32 |
updating |
|
32 | updating to branch default | |
33 | 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 | |
34 | %% proxy url with user name and password |
|
34 | %% proxy url with user name and password | |
35 | requesting all changes |
|
35 | requesting all changes | |
@@ -37,7 +37,7 b' adding changesets' | |||||
37 | adding manifests |
|
37 | adding manifests | |
38 | adding file changes |
|
38 | adding file changes | |
39 | added 1 changesets with 1 changes to 1 files |
|
39 | added 1 changesets with 1 changes to 1 files | |
40 |
updating |
|
40 | updating to branch default | |
41 | 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 | |
42 | %% url with user name and password |
|
42 | %% url with user name and password | |
43 | requesting all changes |
|
43 | requesting all changes | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 1 changesets with 1 changes to 1 files |
|
47 | added 1 changesets with 1 changes to 1 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 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 | |
50 | %% bad host:port for proxy |
|
50 | %% bad host:port for proxy | |
51 | abort: error: Connection refused |
|
51 | abort: error: Connection refused | |
@@ -55,7 +55,7 b' adding changesets' | |||||
55 | adding manifests |
|
55 | adding manifests | |
56 | adding file changes |
|
56 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files |
|
57 | added 1 changesets with 1 changes to 1 files | |
58 |
updating |
|
58 | updating to branch default | |
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 | XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
|
60 | XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - | |
61 | XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - |
|
61 | XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - |
@@ -7,7 +7,7 b" abort: cannot start server at ':20060':" | |||||
7 | streaming all changes |
|
7 | streaming all changes | |
8 | XXX files to transfer, XXX bytes of data |
|
8 | XXX files to transfer, XXX bytes of data | |
9 | transferred XXX bytes in XXX seconds (XXX XB/sec) |
|
9 | transferred XXX bytes in XXX seconds (XXX XB/sec) | |
10 |
updating |
|
10 | updating to branch default | |
11 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
|
11 | XXX files updated, XXX files merged, XXX files removed, XXX files unresolved | |
12 | checking changesets |
|
12 | checking changesets | |
13 | checking manifests |
|
13 | checking manifests | |
@@ -20,7 +20,7 b' adding changesets' | |||||
20 | adding manifests |
|
20 | adding manifests | |
21 | adding file changes |
|
21 | adding file changes | |
22 | added 1 changesets with 4 changes to 4 files |
|
22 | added 1 changesets with 4 changes to 4 files | |
23 |
updating |
|
23 | updating to branch default | |
24 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 | % clone via pull |
|
25 | % clone via pull | |
26 | requesting all changes |
|
26 | requesting all changes | |
@@ -28,7 +28,7 b' adding changesets' | |||||
28 | adding manifests |
|
28 | adding manifests | |
29 | adding file changes |
|
29 | adding file changes | |
30 | added 1 changesets with 4 changes to 4 files |
|
30 | added 1 changesets with 4 changes to 4 files | |
31 |
updating |
|
31 | updating to branch default | |
32 | 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 | |
33 | checking changesets |
|
33 | checking changesets | |
34 | checking manifests |
|
34 | checking manifests |
@@ -6,7 +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 |
|
9 | updating to branch default | |
10 | 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 | |
11 | applying ../tip.patch |
|
11 | applying ../tip.patch | |
12 | % message should be same |
|
12 | % message should be same | |
@@ -19,7 +19,7 b' adding changesets' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
22 |
updating |
|
22 | updating to branch default | |
23 | 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 | |
24 | applying ../tip.patch |
|
24 | applying ../tip.patch | |
25 | line2 |
|
25 | line2 | |
@@ -29,7 +29,7 b' adding changesets' | |||||
29 | adding manifests |
|
29 | adding manifests | |
30 | adding file changes |
|
30 | adding file changes | |
31 | added 1 changesets with 2 changes to 2 files |
|
31 | added 1 changesets with 2 changes to 2 files | |
32 |
updating |
|
32 | updating to branch default | |
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | applying ../tip.patch |
|
34 | applying ../tip.patch | |
35 | abort: empty commit message |
|
35 | abort: empty commit message | |
@@ -39,7 +39,7 b' adding changesets' | |||||
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 1 changesets with 2 changes to 2 files |
|
41 | added 1 changesets with 2 changes to 2 files | |
42 |
updating |
|
42 | updating to branch default | |
43 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | applying ../tip.patch |
|
44 | applying ../tip.patch | |
45 | % import of plain diff with specific date and user |
|
45 | % import of plain diff with specific date and user | |
@@ -48,7 +48,7 b' adding changesets' | |||||
48 | adding manifests |
|
48 | adding manifests | |
49 | adding file changes |
|
49 | adding file changes | |
50 | added 1 changesets with 2 changes to 2 files |
|
50 | added 1 changesets with 2 changes to 2 files | |
51 |
updating |
|
51 | updating to branch default | |
52 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | applying ../tip.patch |
|
53 | applying ../tip.patch | |
54 | changeset: 1:ca68f19f3a40 |
|
54 | changeset: 1:ca68f19f3a40 | |
@@ -73,7 +73,7 b' adding changesets' | |||||
73 | adding manifests |
|
73 | adding manifests | |
74 | adding file changes |
|
74 | adding file changes | |
75 | added 1 changesets with 2 changes to 2 files |
|
75 | added 1 changesets with 2 changes to 2 files | |
76 |
updating |
|
76 | updating to branch default | |
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | applying ../tip.patch |
|
78 | applying ../tip.patch | |
79 | diff -r 80971e65b431 a |
|
79 | diff -r 80971e65b431 a | |
@@ -88,7 +88,7 b' adding changesets' | |||||
88 | adding manifests |
|
88 | adding manifests | |
89 | adding file changes |
|
89 | adding file changes | |
90 | added 1 changesets with 2 changes to 2 files |
|
90 | added 1 changesets with 2 changes to 2 files | |
91 |
updating |
|
91 | updating to branch default | |
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
93 | applying tip.patch |
|
93 | applying tip.patch | |
94 | % import from stdin |
|
94 | % import from stdin | |
@@ -97,7 +97,7 b' adding changesets' | |||||
97 | adding manifests |
|
97 | adding manifests | |
98 | adding file changes |
|
98 | adding file changes | |
99 | added 1 changesets with 2 changes to 2 files |
|
99 | added 1 changesets with 2 changes to 2 files | |
100 |
updating |
|
100 | updating to branch default | |
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 | applying patch from stdin |
|
102 | applying patch from stdin | |
103 | % override commit message |
|
103 | % override commit message | |
@@ -106,7 +106,7 b' adding changesets' | |||||
106 | adding manifests |
|
106 | adding manifests | |
107 | adding file changes |
|
107 | adding file changes | |
108 | added 1 changesets with 2 changes to 2 files |
|
108 | added 1 changesets with 2 changes to 2 files | |
109 |
updating |
|
109 | updating to branch default | |
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 | applying patch from stdin |
|
111 | applying patch from stdin | |
112 | summary: override |
|
112 | summary: override | |
@@ -116,7 +116,7 b' adding changesets' | |||||
116 | adding manifests |
|
116 | adding manifests | |
117 | adding file changes |
|
117 | adding file changes | |
118 | added 1 changesets with 2 changes to 2 files |
|
118 | added 1 changesets with 2 changes to 2 files | |
119 |
updating |
|
119 | updating to branch default | |
120 | 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 | |
121 | applying ../msg.patch |
|
121 | applying ../msg.patch | |
122 | user: email patcher |
|
122 | user: email patcher | |
@@ -127,7 +127,7 b' adding changesets' | |||||
127 | adding manifests |
|
127 | adding manifests | |
128 | adding file changes |
|
128 | adding file changes | |
129 | added 1 changesets with 2 changes to 2 files |
|
129 | added 1 changesets with 2 changes to 2 files | |
130 |
updating |
|
130 | updating to branch default | |
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 | applying patch from stdin |
|
132 | applying patch from stdin | |
133 | % plain diff in email, subject, no message body |
|
133 | % plain diff in email, subject, no message body | |
@@ -136,7 +136,7 b' adding changesets' | |||||
136 | adding manifests |
|
136 | adding manifests | |
137 | adding file changes |
|
137 | adding file changes | |
138 | added 1 changesets with 2 changes to 2 files |
|
138 | added 1 changesets with 2 changes to 2 files | |
139 |
updating |
|
139 | updating to branch default | |
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
141 | applying patch from stdin |
|
141 | applying patch from stdin | |
142 | % plain diff in email, no subject, no message body, should fail |
|
142 | % plain diff in email, no subject, no message body, should fail | |
@@ -145,7 +145,7 b' adding changesets' | |||||
145 | adding manifests |
|
145 | adding manifests | |
146 | adding file changes |
|
146 | adding file changes | |
147 | added 1 changesets with 2 changes to 2 files |
|
147 | added 1 changesets with 2 changes to 2 files | |
148 |
updating |
|
148 | updating to branch default | |
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | applying patch from stdin |
|
150 | applying patch from stdin | |
151 | abort: empty commit message |
|
151 | abort: empty commit message | |
@@ -155,7 +155,7 b' adding changesets' | |||||
155 | adding manifests |
|
155 | adding manifests | |
156 | adding file changes |
|
156 | adding file changes | |
157 | added 1 changesets with 2 changes to 2 files |
|
157 | added 1 changesets with 2 changes to 2 files | |
158 |
updating |
|
158 | updating to branch default | |
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 | applying patch from stdin |
|
160 | applying patch from stdin | |
161 | summary: second change |
|
161 | summary: second change | |
@@ -165,7 +165,7 b' adding changesets' | |||||
165 | adding manifests |
|
165 | adding manifests | |
166 | adding file changes |
|
166 | adding file changes | |
167 | added 1 changesets with 2 changes to 2 files |
|
167 | added 1 changesets with 2 changes to 2 files | |
168 |
updating |
|
168 | updating to branch default | |
169 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
170 | applying patch from stdin |
|
170 | applying patch from stdin | |
171 | email patch |
|
171 | email patch | |
@@ -184,7 +184,7 b' adding changesets' | |||||
184 | adding manifests |
|
184 | adding manifests | |
185 | adding file changes |
|
185 | adding file changes | |
186 | added 1 changesets with 2 changes to 2 files |
|
186 | added 1 changesets with 2 changes to 2 files | |
187 |
updating |
|
187 | updating to branch default | |
188 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
189 | applying ../../../tip.patch |
|
189 | applying ../../../tip.patch | |
190 | % message should be 'subdir change' |
|
190 | % message should be 'subdir change' |
@@ -305,7 +305,7 b' user: test' | |||||
305 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
305 | date: Mon Jan 12 13:46:40 1970 +0000 | |
306 | summary: 8 |
|
306 | summary: 8 | |
307 |
|
307 | |||
308 |
updating |
|
308 | updating to branch default | |
309 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
309 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
310 | checking changesets |
|
310 | checking changesets | |
311 | checking manifests |
|
311 | checking manifests |
@@ -26,7 +26,7 b' adding changesets' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 3 changesets with 2 changes to 2 files |
|
28 | added 3 changesets with 2 changes to 2 files | |
29 | updating working directory |
|
29 | updating to branch br | |
30 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | changeset: 2:1630aed6ed2b |
|
31 | changeset: 2:1630aed6ed2b | |
32 | branch: br |
|
32 | branch: br | |
@@ -41,7 +41,7 b' adding changesets' | |||||
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 3 changesets with 2 changes to 2 files |
|
43 | added 3 changesets with 2 changes to 2 files | |
44 |
updating |
|
44 | updating to branch default | |
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
46 | changeset: 0:cb9a9f314b8b |
|
46 | changeset: 0:cb9a9f314b8b | |
47 | user: test |
|
47 | user: test | |
@@ -54,7 +54,7 b' adding changesets' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 3 changesets with 2 changes to 2 files |
|
56 | added 3 changesets with 2 changes to 2 files | |
57 | updating working directory |
|
57 | updating to branch br | |
58 | 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 | |
59 | changeset: 1:234f53e6c5ff |
|
59 | changeset: 1:234f53e6c5ff | |
60 | branch: br |
|
60 | branch: br |
@@ -280,7 +280,7 b' adding changesets' | |||||
280 | adding manifests |
|
280 | adding manifests | |
281 | adding file changes |
|
281 | adding file changes | |
282 | added 2 changesets with 3 changes to 3 files |
|
282 | added 2 changesets with 3 changes to 3 files | |
283 |
updating |
|
283 | updating to branch default | |
284 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
285 | % incoming |
|
285 | % incoming | |
286 | comparing with test-keyword/Test |
|
286 | comparing with test-keyword/Test |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | adding b |
|
4 | adding b | |
5 | pushing to ../a |
|
5 | pushing to ../a |
@@ -2,7 +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 |
|
5 | updating to branch default | |
6 | 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 | |
7 | % create beta in second repo |
|
7 | % create beta in second repo | |
8 | adding beta |
|
8 | adding beta |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | |
3 | pulling from ../a |
|
3 | pulling from ../a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -1,8 +1,8 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 |
|
3 | updating to branch default | |
4 | 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 |
|
5 | updating to branch default | |
6 | 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 | |
7 | pulling from ../B1 |
|
7 | pulling from ../B1 | |
8 | searching for changes |
|
8 | searching for changes |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | |
3 | pulling from ../test-a |
|
3 | pulling from ../test-a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | |
3 | pulling from ../a |
|
3 | pulling from ../a | |
4 | searching for changes |
|
4 | searching for changes |
@@ -18,7 +18,7 b' patch queue now empty' | |||||
18 | ====== Bundle queue |
|
18 | ====== Bundle queue | |
19 | 1 changesets found |
|
19 | 1 changesets found | |
20 | ====== Clone base |
|
20 | ====== Clone base | |
21 |
updating |
|
21 | updating to branch default | |
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | ====== Incoming queue bundle |
|
23 | ====== Incoming queue bundle | |
24 | >> hg -R .hg/patches incoming ../queue.hgq |
|
24 | >> hg -R .hg/patches incoming ../queue.hgq | |
@@ -41,7 +41,7 b' 0: queue: two.patch added.' | |||||
41 | >> hg qseries |
|
41 | >> hg qseries | |
42 | two.patch |
|
42 | two.patch | |
43 | ====== Clone base again |
|
43 | ====== Clone base again | |
44 |
updating |
|
44 | updating to branch default | |
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
46 | ====== Unbundle queue bundle |
|
46 | ====== Unbundle queue bundle | |
47 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
|
47 | >> hg -R .hg/patches unbundle --update ../queue.hgq |
@@ -20,7 +20,7 b' adding changesets' | |||||
20 | adding manifests |
|
20 | adding manifests | |
21 | adding file changes |
|
21 | adding file changes | |
22 | added 1 changesets with 3 changes to 3 files |
|
22 | added 1 changesets with 3 changes to 3 files | |
23 |
updating |
|
23 | updating to branch default | |
24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 | a |
|
26 | a | |
@@ -45,7 +45,7 b' adding changesets' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 1 changesets with 3 changes to 3 files |
|
47 | added 1 changesets with 3 changes to 3 files | |
48 |
updating |
|
48 | updating to branch default | |
49 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | a |
|
51 | a | |
@@ -70,7 +70,7 b' adding changesets' | |||||
70 | adding manifests |
|
70 | adding manifests | |
71 | adding file changes |
|
71 | adding file changes | |
72 | added 1 changesets with 3 changes to 3 files |
|
72 | added 1 changesets with 3 changes to 3 files | |
73 |
updating |
|
73 | updating to branch default | |
74 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | a |
|
76 | a |
@@ -56,7 +56,7 b' enabled extensions:' | |||||
56 |
|
56 | |||
57 | use "hg -v help mq" to show aliases and global options |
|
57 | use "hg -v help mq" to show aliases and global options | |
58 | adding a |
|
58 | adding a | |
59 |
updating |
|
59 | updating to branch default | |
60 | 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 | |
61 | adding b/z |
|
61 | adding b/z | |
62 | % qinit |
|
62 | % qinit | |
@@ -520,7 +520,7 b' main repo:' | |||||
520 | rev 0: add foo |
|
520 | rev 0: add foo | |
521 | patch repo: |
|
521 | patch repo: | |
522 | rev 0: checkpoint |
|
522 | rev 0: checkpoint | |
523 |
updating |
|
523 | updating to branch default | |
524 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
524 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
525 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
525 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
526 | main repo: |
|
526 | main repo: | |
@@ -533,7 +533,7 b' main repo:' | |||||
533 | rev 0: add foo |
|
533 | rev 0: add foo | |
534 | patch repo: |
|
534 | patch repo: | |
535 | rev 0: checkpoint |
|
535 | rev 0: checkpoint | |
536 |
updating |
|
536 | updating to branch default | |
537 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
537 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
539 | main repo: |
|
539 | main repo: |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | created new head |
|
3 | created new head | |
4 | ** rename in working dir ** |
|
4 | ** rename in working dir ** | |
@@ -120,7 +120,7 b' new file mode 100644' | |||||
120 | +y1 |
|
120 | +y1 | |
121 |
|
121 | |||
122 |
|
122 | |||
123 |
updating |
|
123 | updating to branch default | |
124 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | created new head |
|
125 | created new head | |
126 | ** copy in working dir ** |
|
126 | ** copy in working dir ** | |
@@ -259,7 +259,7 b' new file mode 100644' | |||||
259 | +y1 |
|
259 | +y1 | |
260 |
|
260 | |||
261 |
|
261 | |||
262 |
updating |
|
262 | updating to branch default | |
263 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
264 | created new head |
|
264 | created new head | |
265 | ** single rename ** |
|
265 | ** single rename ** | |
@@ -396,7 +396,7 b' new file mode 100644' | |||||
396 | +y1 |
|
396 | +y1 | |
397 |
|
397 | |||
398 |
|
398 | |||
399 |
updating |
|
399 | updating to branch default | |
400 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
400 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
401 | created new head |
|
401 | created new head | |
402 | ** single copy ** |
|
402 | ** single copy ** | |
@@ -568,7 +568,7 b' new file mode 100644' | |||||
568 | +y1 |
|
568 | +y1 | |
569 |
|
569 | |||
570 |
|
570 | |||
571 |
updating |
|
571 | updating to branch default | |
572 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
572 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
573 | created new head |
|
573 | created new head | |
574 | ** rename chain ** |
|
574 | ** rename chain ** | |
@@ -694,7 +694,7 b' new file mode 100644' | |||||
694 | +y1 |
|
694 | +y1 | |
695 |
|
695 | |||
696 |
|
696 | |||
697 |
updating |
|
697 | updating to branch default | |
698 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
698 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
699 | created new head |
|
699 | created new head | |
700 | ** copy chain ** |
|
700 | ** copy chain ** | |
@@ -937,7 +937,7 b' new file mode 100644' | |||||
937 | +y1 |
|
937 | +y1 | |
938 |
|
938 | |||
939 |
|
939 | |||
940 |
updating |
|
940 | updating to branch default | |
941 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
941 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
942 | created new head |
|
942 | created new head | |
943 | ** circular rename ** |
|
943 | ** circular rename ** | |
@@ -1061,7 +1061,7 b' new file mode 100644' | |||||
1061 | +y1 |
|
1061 | +y1 | |
1062 |
|
1062 | |||
1063 |
|
1063 | |||
1064 |
updating |
|
1064 | updating to branch default | |
1065 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1065 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1066 | created new head |
|
1066 | created new head | |
1067 | moving x/x to y/x |
|
1067 | moving x/x to y/x |
@@ -1,5 +1,5 b'' | |||||
1 | % clone |
|
1 | % clone | |
2 |
updating |
|
2 | updating to branch default | |
3 | 0 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 | % commit |
|
4 | % commit | |
5 | adding a |
|
5 | adding a |
@@ -61,7 +61,7 b' no commands defined' | |||||
61 | % commit |
|
61 | % commit | |
62 | adding a |
|
62 | adding a | |
63 | % clone |
|
63 | % clone | |
64 |
updating |
|
64 | updating to branch default | |
65 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 | % commit |
|
66 | % commit | |
67 | % pull (minimal config) |
|
67 | % pull (minimal config) |
@@ -5,7 +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 |
|
8 | updating to branch default | |
9 | 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 | |
10 | applying ../a.diff |
|
10 | applying ../a.diff | |
11 | Using custom patch |
|
11 | Using custom patch |
@@ -1,2 +1,2 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | % expect error, cloning not allowed |
|
4 | % expect error, cloning not allowed | |
5 | abort: authorization failed |
|
5 | abort: authorization failed |
@@ -3,7 +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 |
|
6 | updating to branch default | |
7 | 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 | |
8 | checking changesets |
|
8 | checking changesets | |
9 | checking manifests |
|
9 | checking manifests |
@@ -3,7 +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 |
|
6 | updating to branch default | |
7 | 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 | |
8 | pulling from ../source2 |
|
8 | pulling from ../source2 | |
9 | pulling from ../source1 |
|
9 | pulling from ../source1 |
@@ -1,5 +1,5 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | % should fail |
|
4 | % should fail | |
5 | pulling from ../tt |
|
5 | pulling from ../tt |
@@ -9,7 +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 |
|
12 | updating to branch default | |
13 | 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 | |
14 | checking changesets |
|
14 | checking changesets | |
15 | checking manifests |
|
15 | checking manifests |
@@ -1,7 +1,7 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 |
|
4 | updating to branch default | |
5 | 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 | |
6 | pushing to ../2 |
|
6 | pushing to ../2 | |
7 | searching for changes |
|
7 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | % expect ssl error |
|
4 | % expect ssl error | |
5 | pushing to http://localhost/ |
|
5 | pushing to http://localhost/ |
@@ -1,4 +1,4 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 | |
3 | pushing to ../a |
|
3 | pushing to ../a | |
4 | searching for changes |
|
4 | searching for changes | |
@@ -24,7 +24,7 b' adding manifests' | |||||
24 | adding file changes |
|
24 | adding file changes | |
25 | added 2 changesets with 1 changes to 1 files |
|
25 | added 2 changesets with 1 changes to 1 files | |
26 | adding foo |
|
26 | adding foo | |
27 |
updating |
|
27 | updating to branch default | |
28 | 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 | |
29 | 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 | |
30 | created new head |
|
30 | created new head | |
@@ -127,7 +127,7 b' 0' | |||||
127 | % checking prepush logic does not allow silently pushing multiple new heads |
|
127 | % checking prepush logic does not allow silently pushing multiple new heads | |
128 | adding init |
|
128 | adding init | |
129 | adding a |
|
129 | adding a | |
130 |
updating |
|
130 | updating to branch default | |
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
133 | adding b |
|
133 | adding b |
@@ -1,6 +1,6 b'' | |||||
1 |
updating |
|
1 | updating to branch default | |
2 | 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 |
|
3 | updating to branch default | |
4 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 |
|
5 | |||
6 | % Now b has one revision to be pulled from a |
|
6 | % Now b has one revision to be pulled from a |
@@ -1,7 +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 |
|
4 | updating to branch default | |
5 | 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 | |
6 | adding b |
|
6 | adding b | |
7 | % update source repository |
|
7 | % update source repository |
@@ -1,5 +1,5 b'' | |||||
1 | adding a/f |
|
1 | adding a/f | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | moving a/f to b/f |
|
4 | moving a/f to b/f | |
5 | adding a/aa/g |
|
5 | adding a/aa/g |
@@ -1,7 +1,7 b'' | |||||
1 | # -- setting up base repo |
|
1 | # -- setting up base repo | |
2 | adding a |
|
2 | adding a | |
3 | # -- cloning base repo |
|
3 | # -- cloning base repo | |
4 |
updating |
|
4 | updating to branch default | |
5 | 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 | |
6 | # -- setting up cset to push |
|
6 | # -- setting up cset to push | |
7 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
7 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -4,7 +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 |
|
7 | updating to branch default | |
8 | 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 | |
9 | 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 | |
10 | pulling from ../branch |
|
10 | pulling from ../branch |
@@ -32,7 +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 |
|
35 | updating to branch default | |
36 | 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 | |
37 | checking changesets |
|
37 | checking changesets | |
38 | checking manifests |
|
38 | checking manifests | |
@@ -44,7 +44,7 b' adding changesets' | |||||
44 | adding manifests |
|
44 | adding manifests | |
45 | adding file changes |
|
45 | adding file changes | |
46 | added 2 changesets with 2 changes to 1 files |
|
46 | added 2 changesets with 2 changes to 1 files | |
47 |
updating |
|
47 | updating to branch default | |
48 | 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 | |
49 | checking changesets |
|
49 | checking changesets | |
50 | checking manifests |
|
50 | checking manifests | |
@@ -56,7 +56,7 b' adding changesets' | |||||
56 | adding manifests |
|
56 | adding manifests | |
57 | adding file changes |
|
57 | adding file changes | |
58 | added 3 changesets with 3 changes to 1 files |
|
58 | added 3 changesets with 3 changes to 1 files | |
59 |
updating |
|
59 | updating to branch default | |
60 | 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 | |
61 | checking changesets |
|
61 | checking changesets | |
62 | checking manifests |
|
62 | checking manifests | |
@@ -68,7 +68,7 b' adding changesets' | |||||
68 | adding manifests |
|
68 | adding manifests | |
69 | adding file changes |
|
69 | adding file changes | |
70 | added 4 changesets with 4 changes to 1 files |
|
70 | added 4 changesets with 4 changes to 1 files | |
71 |
updating |
|
71 | updating to branch default | |
72 | 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 | |
73 | checking changesets |
|
73 | checking changesets | |
74 | checking manifests |
|
74 | checking manifests | |
@@ -80,7 +80,7 b' adding changesets' | |||||
80 | adding manifests |
|
80 | adding manifests | |
81 | adding file changes |
|
81 | adding file changes | |
82 | added 2 changesets with 2 changes to 1 files |
|
82 | added 2 changesets with 2 changes to 1 files | |
83 |
updating |
|
83 | updating to branch default | |
84 | 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 | |
85 | checking changesets |
|
85 | checking changesets | |
86 | checking manifests |
|
86 | checking manifests | |
@@ -92,7 +92,7 b' adding changesets' | |||||
92 | adding manifests |
|
92 | adding manifests | |
93 | adding file changes |
|
93 | adding file changes | |
94 | added 3 changesets with 3 changes to 1 files |
|
94 | added 3 changesets with 3 changes to 1 files | |
95 |
updating |
|
95 | updating to branch default | |
96 | 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 | |
97 | checking changesets |
|
97 | checking changesets | |
98 | checking manifests |
|
98 | checking manifests | |
@@ -104,7 +104,7 b' adding changesets' | |||||
104 | adding manifests |
|
104 | adding manifests | |
105 | adding file changes |
|
105 | adding file changes | |
106 | added 4 changesets with 5 changes to 2 files |
|
106 | added 4 changesets with 5 changes to 2 files | |
107 |
updating |
|
107 | updating to branch default | |
108 | 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 | |
109 | checking changesets |
|
109 | checking changesets | |
110 | checking manifests |
|
110 | checking manifests | |
@@ -116,7 +116,7 b' adding changesets' | |||||
116 | adding manifests |
|
116 | adding manifests | |
117 | adding file changes |
|
117 | adding file changes | |
118 | added 5 changesets with 6 changes to 3 files |
|
118 | added 5 changesets with 6 changes to 3 files | |
119 |
updating |
|
119 | updating to branch default | |
120 | 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 | |
121 | checking changesets |
|
121 | checking changesets | |
122 | checking manifests |
|
122 | checking manifests | |
@@ -128,7 +128,7 b' adding changesets' | |||||
128 | adding manifests |
|
128 | adding manifests | |
129 | adding file changes |
|
129 | adding file changes | |
130 | added 5 changesets with 5 changes to 2 files |
|
130 | added 5 changesets with 5 changes to 2 files | |
131 |
updating |
|
131 | updating to branch default | |
132 | 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 | |
133 | checking changesets |
|
133 | checking changesets | |
134 | checking manifests |
|
134 | checking manifests |
@@ -6,7 +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 |
|
9 | updating to branch default | |
10 | 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 | |
11 | checking changesets |
|
11 | checking changesets | |
12 | checking manifests |
|
12 | checking manifests | |
@@ -19,7 +19,7 b' adding changesets' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 2 changes to 2 files |
|
21 | added 1 changesets with 2 changes to 2 files | |
22 |
updating |
|
22 | updating to branch default | |
23 | 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 | |
24 | # verify |
|
24 | # verify | |
25 | checking changesets |
|
25 | checking changesets |
@@ -12,7 +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 |
|
15 | updating to branch default | |
16 | 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 | |
17 | checking changesets |
|
17 | checking changesets | |
18 | checking manifests |
|
18 | checking manifests | |
@@ -39,7 +39,7 b' adding changesets' | |||||
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 1 changesets with 1 changes to 1 files |
|
41 | added 1 changesets with 1 changes to 1 files | |
42 |
updating |
|
42 | updating to branch default | |
43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | checking changesets |
|
44 | checking changesets | |
45 | checking manifests |
|
45 | checking manifests | |
@@ -50,7 +50,7 b' a' | |||||
50 | default = static-http://localhost/ |
|
50 | default = static-http://localhost/ | |
51 | % test with empty repo (issue965) |
|
51 | % test with empty repo (issue965) | |
52 | no changes found |
|
52 | no changes found | |
53 |
updating |
|
53 | updating to branch default | |
54 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
54 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
55 | checking changesets |
|
55 | checking changesets | |
56 | checking manifests |
|
56 | checking manifests |
@@ -97,7 +97,7 b' conflict' | |||||
97 | t3 |
|
97 | t3 | |
98 | >>>>>>> other |
|
98 | >>>>>>> other | |
99 | % clone |
|
99 | % clone | |
100 |
updating |
|
100 | updating to branch default | |
101 | pulling subrepo s |
|
101 | pulling subrepo s | |
102 | requesting all changes |
|
102 | requesting all changes | |
103 | adding changesets |
|
103 | adding changesets |
@@ -3,5 +3,5 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 4 changes to 4 files |
|
5 | added 1 changesets with 4 changes to 4 files | |
6 |
updating |
|
6 | updating to branch default | |
7 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -19,7 +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 |
|
22 | updating to branch default | |
23 | 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 | |
24 | # git symlink diff |
|
24 | # git symlink diff | |
25 | 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,7 +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 |
|
13 | updating to branch default | |
14 | 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 | |
15 | 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 | |
16 | % rebase b onto r1 |
|
16 | % rebase b onto r1 | |
@@ -28,7 +28,7 b' 3 b2' | |||||
28 | 2 0:17ab29e464c6 b1 |
|
28 | 2 0:17ab29e464c6 b1 | |
29 | 1 r2 |
|
29 | 1 r2 | |
30 | 0 r1 |
|
30 | 0 r1 | |
31 |
updating |
|
31 | updating to branch default | |
32 | 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 | |
33 | 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 | |
34 | % rebase b onto r1, skipping b2 |
|
34 | % rebase b onto r1, skipping b2 | |
@@ -49,7 +49,7 b' adding changesets' | |||||
49 | adding manifests |
|
49 | adding manifests | |
50 | adding file changes |
|
50 | adding file changes | |
51 | added 2 changesets with 2 changes to 2 files |
|
51 | added 2 changesets with 2 changes to 2 files | |
52 |
updating |
|
52 | updating to branch default | |
53 | 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 | |
54 | searching for changes |
|
54 | searching for changes | |
55 | applying 37a1297eb21b |
|
55 | applying 37a1297eb21b | |
@@ -75,7 +75,7 b' 1 r2' | |||||
75 | 0 r1 |
|
75 | 0 r1 | |
76 | % skip local changes transplanted to the source |
|
76 | % skip local changes transplanted to the source | |
77 | adding b4 |
|
77 | adding b4 | |
78 |
updating |
|
78 | updating to branch default | |
79 | 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 | |
80 | searching for changes |
|
80 | searching for changes | |
81 | applying 4333daefcb15 |
|
81 | applying 4333daefcb15 | |
@@ -86,7 +86,7 b' adding changesets' | |||||
86 | adding manifests |
|
86 | adding manifests | |
87 | adding file changes |
|
87 | adding file changes | |
88 | added 1 changesets with 1 changes to 1 files |
|
88 | added 1 changesets with 1 changes to 1 files | |
89 |
updating |
|
89 | updating to branch default | |
90 | 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 | |
91 | searching for changes |
|
91 | searching for changes | |
92 | searching for changes |
|
92 | searching for changes |
@@ -1,5 +1,5 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
updating |
|
2 | updating to branch default | |
3 | 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 | 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 | |
5 | diff -r 33aaa84a386b a |
|
5 | diff -r 33aaa84a386b a |
@@ -5,7 +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 | updating to branch foo | |
9 | 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 | |
10 | % heads |
|
10 | % heads | |
11 | changeset: 1:cd2a86ecc814 |
|
11 | changeset: 1:cd2a86ecc814 |
@@ -4,7 +4,7 b' pretxnchangegroup.crlf = python:hgext.wi' | |||||
4 |
|
4 | |||
5 | commit should succeed |
|
5 | commit should succeed | |
6 |
|
6 | |||
7 |
updating |
|
7 | updating to branch default | |
8 | 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 | |
9 | commit should fail |
|
9 | commit should fail | |
10 | Attempt to commit or push text file(s) using CRLF line endings |
|
10 | Attempt to commit or push text file(s) using CRLF line endings | |
@@ -113,7 +113,7 b' 1' | |||||
113 |
|
113 | |||
114 |
|
114 | |||
115 |
|
115 | |||
116 |
updating |
|
116 | updating to branch default | |
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 |
|
118 | |||
119 | adding dupe/a |
|
119 | adding dupe/a |
General Comments 0
You need to be logged in to leave comments.
Login now