1 |
|
2 % prepare repo a |
|
3 % list files in store/data (should show a 'b.d') |
|
4 .hg/store/data/a.i |
|
5 .hg/store/data/b.d |
|
6 .hg/store/data/b.i |
|
7 |
|
8 % default operation |
|
9 updating to branch default |
|
10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 a |
|
12 checking changesets |
|
13 checking manifests |
|
14 crosschecking files in changesets and manifests |
|
15 checking files |
|
16 2 files, 11 changesets, 11 total revisions |
|
17 |
|
18 % no update, with debug option |
|
19 linked 8 files |
|
20 a not present |
|
21 checking changesets |
|
22 checking manifests |
|
23 crosschecking files in changesets and manifests |
|
24 checking files |
|
25 2 files, 11 changesets, 11 total revisions |
|
26 |
|
27 % default destination |
|
28 destination directory: a |
|
29 updating to branch default |
|
30 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
31 a |
|
32 |
|
33 % check that we drop the file: from the path before |
|
34 % writing the .hgrc |
|
35 updating to branch default |
|
36 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 |
|
38 % check that path aliases are expanded |
|
39 a#0 |
|
40 |
|
41 % use --pull |
|
42 requesting all changes |
|
43 adding changesets |
|
44 adding manifests |
|
45 adding file changes |
|
46 added 11 changesets with 11 changes to 2 files |
|
47 updating to branch default |
|
48 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 checking changesets |
|
50 checking manifests |
|
51 crosschecking files in changesets and manifests |
|
52 checking files |
|
53 2 files, 11 changesets, 11 total revisions |
|
54 |
|
55 % clone to . |
|
56 updating to branch default |
|
57 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 |
|
59 |
|
60 % *** tests for option -u *** |
|
61 |
|
62 |
|
63 % adding some more history to repo a |
|
64 % tag ref1 |
|
65 % updating back to ref1 |
|
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
67 |
|
68 % add branch 'stable' to repo a for later tests |
|
69 marked working directory as branch stable |
|
70 % tag ref2 |
|
71 |
|
72 % updating back to ref2 |
|
73 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
74 |
|
75 % parents of repo a |
|
76 changeset: 13:e8ece76546a6 |
|
77 branch: stable |
|
78 tag: ref2 |
|
79 parent: 10:a7949464abda |
|
80 user: test |
|
81 date: Thu Jan 01 00:00:00 1970 +0000 |
|
82 summary: starting branch stable |
|
83 |
|
84 |
|
85 % repo a has two heads |
|
86 changeset: 15:0aae7cf88f0d |
|
87 branch: stable |
|
88 tag: tip |
|
89 user: test |
|
90 date: Thu Jan 01 00:00:00 1970 +0000 |
|
91 summary: another change for branch stable |
|
92 |
|
93 changeset: 12:f21241060d6a |
|
94 user: test |
|
95 date: Thu Jan 01 00:00:00 1970 +0000 |
|
96 summary: hacked default |
|
97 |
|
98 |
|
99 % testing clone -U -u 1 a ua (must abort) |
|
100 abort: cannot specify both --noupdate and --updaterev |
|
101 |
|
102 % testing clone -u . a ua |
|
103 updating to branch stable |
|
104 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
105 |
|
106 % repo ua has both heads |
|
107 changeset: 15:0aae7cf88f0d |
|
108 branch: stable |
|
109 tag: tip |
|
110 user: test |
|
111 date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 summary: another change for branch stable |
|
113 |
|
114 changeset: 12:f21241060d6a |
|
115 user: test |
|
116 date: Thu Jan 01 00:00:00 1970 +0000 |
|
117 summary: hacked default |
|
118 |
|
119 |
|
120 % same revision checked out in repo a and ua |
|
121 e8ece76546a6 |
|
122 e8ece76546a6 |
|
123 |
|
124 % testing clone --pull -u . a ua |
|
125 requesting all changes |
|
126 adding changesets |
|
127 adding manifests |
|
128 adding file changes |
|
129 added 16 changesets with 16 changes to 3 files (+1 heads) |
|
130 updating to branch stable |
|
131 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 |
|
133 % repo ua has both heads |
|
134 changeset: 15:0aae7cf88f0d |
|
135 branch: stable |
|
136 tag: tip |
|
137 user: test |
|
138 date: Thu Jan 01 00:00:00 1970 +0000 |
|
139 summary: another change for branch stable |
|
140 |
|
141 changeset: 12:f21241060d6a |
|
142 user: test |
|
143 date: Thu Jan 01 00:00:00 1970 +0000 |
|
144 summary: hacked default |
|
145 |
|
146 |
|
147 % same revision checked out in repo a and ua |
|
148 e8ece76546a6 |
|
149 e8ece76546a6 |
|
150 |
|
151 % testing clone -u stable a ua |
|
152 updating to branch stable |
|
153 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
154 |
|
155 % repo ua has both heads |
|
156 changeset: 15:0aae7cf88f0d |
|
157 branch: stable |
|
158 tag: tip |
|
159 user: test |
|
160 date: Thu Jan 01 00:00:00 1970 +0000 |
|
161 summary: another change for branch stable |
|
162 |
|
163 changeset: 12:f21241060d6a |
|
164 user: test |
|
165 date: Thu Jan 01 00:00:00 1970 +0000 |
|
166 summary: hacked default |
|
167 |
|
168 |
|
169 % branch stable is checked out |
|
170 changeset: 15:0aae7cf88f0d |
|
171 branch: stable |
|
172 tag: tip |
|
173 user: test |
|
174 date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 summary: another change for branch stable |
|
176 |
|
177 |
|
178 % testing clone a ua |
|
179 updating to branch default |
|
180 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
181 |
|
182 % repo ua has both heads |
|
183 changeset: 15:0aae7cf88f0d |
|
184 branch: stable |
|
185 tag: tip |
|
186 user: test |
|
187 date: Thu Jan 01 00:00:00 1970 +0000 |
|
188 summary: another change for branch stable |
|
189 |
|
190 changeset: 12:f21241060d6a |
|
191 user: test |
|
192 date: Thu Jan 01 00:00:00 1970 +0000 |
|
193 summary: hacked default |
|
194 |
|
195 |
|
196 % branch default is checked out |
|
197 changeset: 12:f21241060d6a |
|
198 user: test |
|
199 date: Thu Jan 01 00:00:00 1970 +0000 |
|
200 summary: hacked default |
|
201 |
|
202 |
|
203 % testing clone -u . a#stable ua |
|
204 requesting all changes |
|
205 adding changesets |
|
206 adding manifests |
|
207 adding file changes |
|
208 added 14 changesets with 14 changes to 3 files |
|
209 updating to branch stable |
|
210 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
211 |
|
212 % repo ua has only branch stable |
|
213 changeset: 13:0aae7cf88f0d |
|
214 branch: stable |
|
215 tag: tip |
|
216 user: test |
|
217 date: Thu Jan 01 00:00:00 1970 +0000 |
|
218 summary: another change for branch stable |
|
219 |
|
220 changeset: 10:a7949464abda |
|
221 user: test |
|
222 date: Thu Jan 01 00:00:00 1970 +0000 |
|
223 summary: test |
|
224 |
|
225 |
|
226 % same revision checked out in repo a and ua |
|
227 e8ece76546a6 |
|
228 e8ece76546a6 |
|
229 |
|
230 % testing clone -u . -r stable a ua |
|
231 requesting all changes |
|
232 adding changesets |
|
233 adding manifests |
|
234 adding file changes |
|
235 added 14 changesets with 14 changes to 3 files |
|
236 updating to branch stable |
|
237 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
238 |
|
239 % repo ua has only branch stable |
|
240 changeset: 13:0aae7cf88f0d |
|
241 branch: stable |
|
242 tag: tip |
|
243 user: test |
|
244 date: Thu Jan 01 00:00:00 1970 +0000 |
|
245 summary: another change for branch stable |
|
246 |
|
247 changeset: 10:a7949464abda |
|
248 user: test |
|
249 date: Thu Jan 01 00:00:00 1970 +0000 |
|
250 summary: test |
|
251 |
|
252 |
|
253 % same revision checked out in repo a and ua |
|
254 e8ece76546a6 |
|
255 e8ece76546a6 |
|
256 |
|
257 % testing clone -r stable a ua |
|
258 requesting all changes |
|
259 adding changesets |
|
260 adding manifests |
|
261 adding file changes |
|
262 added 14 changesets with 14 changes to 3 files |
|
263 updating to branch stable |
|
264 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
265 |
|
266 % repo ua has only branch stable |
|
267 changeset: 13:0aae7cf88f0d |
|
268 branch: stable |
|
269 tag: tip |
|
270 user: test |
|
271 date: Thu Jan 01 00:00:00 1970 +0000 |
|
272 summary: another change for branch stable |
|
273 |
|
274 changeset: 10:a7949464abda |
|
275 user: test |
|
276 date: Thu Jan 01 00:00:00 1970 +0000 |
|
277 summary: test |
|
278 |
|
279 |
|
280 % branch stable is checked out |
|
281 changeset: 13:0aae7cf88f0d |
|
282 branch: stable |
|
283 tag: tip |
|
284 user: test |
|
285 date: Thu Jan 01 00:00:00 1970 +0000 |
|
286 summary: another change for branch stable |
|
287 |
|
288 |
|
289 % testing clone -u . -r stable -r default a ua |
|
290 requesting all changes |
|
291 adding changesets |
|
292 adding manifests |
|
293 adding file changes |
|
294 added 16 changesets with 16 changes to 3 files (+1 heads) |
|
295 updating to branch stable |
|
296 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 |
|
298 % repo ua has two heads |
|
299 changeset: 15:0aae7cf88f0d |
|
300 branch: stable |
|
301 tag: tip |
|
302 user: test |
|
303 date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 summary: another change for branch stable |
|
305 |
|
306 changeset: 12:f21241060d6a |
|
307 user: test |
|
308 date: Thu Jan 01 00:00:00 1970 +0000 |
|
309 summary: hacked default |
|
310 |
|
311 |
|
312 % same revision checked out in repo a and ua |
|
313 e8ece76546a6 |
|
314 e8ece76546a6 |
|
315 updating to branch default |
|
316 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|