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