|
1 This test file test the various messages when accessing obsolete |
|
2 revisions. |
|
3 |
|
4 Global setup |
|
5 ============ |
|
6 |
|
7 $ . $TESTDIR/testlib/common.sh |
|
8 $ cat >> $HGRCPATH <<EOF |
|
9 > [ui] |
|
10 > interactive = true |
|
11 > [phases] |
|
12 > publish=False |
|
13 > [extensions] |
|
14 > evolve = |
|
15 > EOF |
|
16 |
|
17 Test output on amended commit |
|
18 ============================= |
|
19 |
|
20 Test setup |
|
21 ---------- |
|
22 |
|
23 $ hg init $TESTTMP/local-amend |
|
24 $ cd $TESTTMP/local-amend |
|
25 $ mkcommit ROOT |
|
26 $ mkcommit A0 |
|
27 $ echo 42 >> A0 |
|
28 $ hg amend -m "A1" |
|
29 $ hg log --hidden -G |
|
30 @ changeset: 3:a468dc9b3633 |
|
31 | tag: tip |
|
32 | parent: 0:ea207398892e |
|
33 | user: test |
|
34 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
35 | summary: A1 |
|
36 | |
|
37 | x changeset: 2:f137d23bb3e1 |
|
38 | | user: test |
|
39 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
40 | | summary: temporary amend commit for 471f378eab4c |
|
41 | | |
|
42 | x changeset: 1:471f378eab4c |
|
43 |/ user: test |
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
45 | summary: A0 |
|
46 | |
|
47 o changeset: 0:ea207398892e |
|
48 user: test |
|
49 date: Thu Jan 01 00:00:00 1970 +0000 |
|
50 summary: ROOT |
|
51 |
|
52 Actual test |
|
53 ----------- |
|
54 |
|
55 $ hg update --hidden "desc(A0)" |
|
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
57 working directory parent is obsolete! (471f378eab4c) |
|
58 (use 'hg evolve' to update to its successor: a468dc9b3633) |
|
59 |
|
60 Test output with pruned commit |
|
61 ============================== |
|
62 |
|
63 Test setup |
|
64 ---------- |
|
65 |
|
66 $ hg init $TESTTMP/local-prune |
|
67 $ cd $TESTTMP/local-prune |
|
68 $ mkcommit ROOT |
|
69 $ mkcommit A0 # 0 |
|
70 $ mkcommit B0 # 1 |
|
71 $ hg log --hidden -G |
|
72 @ changeset: 2:0dec01379d3b |
|
73 | tag: tip |
|
74 | user: test |
|
75 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
76 | summary: B0 |
|
77 | |
|
78 o changeset: 1:471f378eab4c |
|
79 | user: test |
|
80 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
81 | summary: A0 |
|
82 | |
|
83 o changeset: 0:ea207398892e |
|
84 user: test |
|
85 date: Thu Jan 01 00:00:00 1970 +0000 |
|
86 summary: ROOT |
|
87 |
|
88 $ hg prune -r 'desc(B0)' |
|
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
90 working directory now at 471f378eab4c |
|
91 1 changesets pruned |
|
92 |
|
93 Actual test |
|
94 ----------- |
|
95 |
|
96 $ hg up --hidden -r 'desc(B0)' |
|
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
98 working directory parent is obsolete! (0dec01379d3b) |
|
99 (use 'hg evolve' to update to its parent successor) |
|
100 |
|
101 Test output with splitted commit |
|
102 ================================ |
|
103 |
|
104 Test setup |
|
105 ---------- |
|
106 |
|
107 $ hg init $TESTTMP/local-split |
|
108 $ cd $TESTTMP/local-split |
|
109 $ mkcommit ROOT |
|
110 $ echo 42 >> a |
|
111 $ echo 43 >> b |
|
112 $ hg commit -A -m "A0" |
|
113 adding a |
|
114 adding b |
|
115 $ hg log --hidden -G |
|
116 @ changeset: 1:471597cad322 |
|
117 | tag: tip |
|
118 | user: test |
|
119 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
120 | summary: A0 |
|
121 | |
|
122 o changeset: 0:ea207398892e |
|
123 user: test |
|
124 date: Thu Jan 01 00:00:00 1970 +0000 |
|
125 summary: ROOT |
|
126 |
|
127 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
|
128 > y |
|
129 > y |
|
130 > n |
|
131 > n |
|
132 > y |
|
133 > y |
|
134 > EOF |
|
135 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
136 adding a |
|
137 adding b |
|
138 diff --git a/a b/a |
|
139 new file mode 100644 |
|
140 examine changes to 'a'? [Ynesfdaq?] y |
|
141 |
|
142 @@ -0,0 +1,1 @@ |
|
143 +42 |
|
144 record change 1/2 to 'a'? [Ynesfdaq?] y |
|
145 |
|
146 diff --git a/b b/b |
|
147 new file mode 100644 |
|
148 examine changes to 'b'? [Ynesfdaq?] n |
|
149 |
|
150 created new head |
|
151 Done splitting? [yN] n |
|
152 diff --git a/b b/b |
|
153 new file mode 100644 |
|
154 examine changes to 'b'? [Ynesfdaq?] y |
|
155 |
|
156 @@ -0,0 +1,1 @@ |
|
157 +43 |
|
158 record this change to 'b'? [Ynesfdaq?] y |
|
159 |
|
160 no more change to split |
|
161 |
|
162 $ hg log --hidden -G |
|
163 @ changeset: 3:f257fde29c7a |
|
164 | tag: tip |
|
165 | user: test |
|
166 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 | summary: A0 |
|
168 | |
|
169 o changeset: 2:337fec4d2edc |
|
170 | parent: 0:ea207398892e |
|
171 | user: test |
|
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
173 | summary: A0 |
|
174 | |
|
175 | x changeset: 1:471597cad322 |
|
176 |/ user: test |
|
177 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
178 | summary: A0 |
|
179 | |
|
180 o changeset: 0:ea207398892e |
|
181 user: test |
|
182 date: Thu Jan 01 00:00:00 1970 +0000 |
|
183 summary: ROOT |
|
184 |
|
185 Actual test |
|
186 ----------- |
|
187 |
|
188 $ hg update --hidden 'min(desc(A0))' |
|
189 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
190 working directory parent is obsolete! (471597cad322) |
|
191 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
|
192 |
|
193 Test output with lots of splitted commit |
|
194 ======================================== |
|
195 |
|
196 Test setup |
|
197 ---------- |
|
198 |
|
199 $ hg init $TESTTMP/local-lots-split |
|
200 $ cd $TESTTMP/local-lots-split |
|
201 $ mkcommit ROOT |
|
202 $ echo 42 >> a |
|
203 $ echo 43 >> b |
|
204 $ echo 44 >> c |
|
205 $ echo 45 >> d |
|
206 $ hg commit -A -m "A0" |
|
207 adding a |
|
208 adding b |
|
209 adding c |
|
210 adding d |
|
211 $ hg log --hidden -G |
|
212 @ changeset: 1:de7290d8b885 |
|
213 | tag: tip |
|
214 | user: test |
|
215 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
216 | summary: A0 |
|
217 | |
|
218 o changeset: 0:ea207398892e |
|
219 user: test |
|
220 date: Thu Jan 01 00:00:00 1970 +0000 |
|
221 summary: ROOT |
|
222 |
|
223 |
|
224 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
|
225 > y |
|
226 > y |
|
227 > n |
|
228 > n |
|
229 > n |
|
230 > n |
|
231 > y |
|
232 > y |
|
233 > n |
|
234 > n |
|
235 > n |
|
236 > y |
|
237 > y |
|
238 > n |
|
239 > n |
|
240 > y |
|
241 > y |
|
242 > EOF |
|
243 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
244 adding a |
|
245 adding b |
|
246 adding c |
|
247 adding d |
|
248 diff --git a/a b/a |
|
249 new file mode 100644 |
|
250 examine changes to 'a'? [Ynesfdaq?] y |
|
251 |
|
252 @@ -0,0 +1,1 @@ |
|
253 +42 |
|
254 record change 1/4 to 'a'? [Ynesfdaq?] y |
|
255 |
|
256 diff --git a/b b/b |
|
257 new file mode 100644 |
|
258 examine changes to 'b'? [Ynesfdaq?] n |
|
259 |
|
260 diff --git a/c b/c |
|
261 new file mode 100644 |
|
262 examine changes to 'c'? [Ynesfdaq?] n |
|
263 |
|
264 diff --git a/d b/d |
|
265 new file mode 100644 |
|
266 examine changes to 'd'? [Ynesfdaq?] n |
|
267 |
|
268 created new head |
|
269 Done splitting? [yN] n |
|
270 diff --git a/b b/b |
|
271 new file mode 100644 |
|
272 examine changes to 'b'? [Ynesfdaq?] y |
|
273 |
|
274 @@ -0,0 +1,1 @@ |
|
275 +43 |
|
276 record change 1/3 to 'b'? [Ynesfdaq?] y |
|
277 |
|
278 diff --git a/c b/c |
|
279 new file mode 100644 |
|
280 examine changes to 'c'? [Ynesfdaq?] n |
|
281 |
|
282 diff --git a/d b/d |
|
283 new file mode 100644 |
|
284 examine changes to 'd'? [Ynesfdaq?] n |
|
285 |
|
286 Done splitting? [yN] n |
|
287 diff --git a/c b/c |
|
288 new file mode 100644 |
|
289 examine changes to 'c'? [Ynesfdaq?] y |
|
290 |
|
291 @@ -0,0 +1,1 @@ |
|
292 +44 |
|
293 record change 1/2 to 'c'? [Ynesfdaq?] y |
|
294 |
|
295 diff --git a/d b/d |
|
296 new file mode 100644 |
|
297 examine changes to 'd'? [Ynesfdaq?] n |
|
298 |
|
299 Done splitting? [yN] n |
|
300 diff --git a/d b/d |
|
301 new file mode 100644 |
|
302 examine changes to 'd'? [Ynesfdaq?] y |
|
303 |
|
304 @@ -0,0 +1,1 @@ |
|
305 +45 |
|
306 record this change to 'd'? [Ynesfdaq?] y |
|
307 |
|
308 no more change to split |
|
309 |
|
310 $ hg log --hidden -G |
|
311 @ changeset: 5:c7f044602e9b |
|
312 | tag: tip |
|
313 | user: test |
|
314 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
315 | summary: A0 |
|
316 | |
|
317 o changeset: 4:1ae8bc733a14 |
|
318 | user: test |
|
319 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
320 | summary: A0 |
|
321 | |
|
322 o changeset: 3:f257fde29c7a |
|
323 | user: test |
|
324 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
325 | summary: A0 |
|
326 | |
|
327 o changeset: 2:337fec4d2edc |
|
328 | parent: 0:ea207398892e |
|
329 | user: test |
|
330 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
331 | summary: A0 |
|
332 | |
|
333 | x changeset: 1:de7290d8b885 |
|
334 |/ user: test |
|
335 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
336 | summary: A0 |
|
337 | |
|
338 o changeset: 0:ea207398892e |
|
339 user: test |
|
340 date: Thu Jan 01 00:00:00 1970 +0000 |
|
341 summary: ROOT |
|
342 |
|
343 Actual test |
|
344 ----------- |
|
345 |
|
346 $ hg update --hidden 'min(desc(A0))' |
|
347 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
348 working directory parent is obsolete! (de7290d8b885) |
|
349 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
|
350 |
|
351 Test output with folded commit |
|
352 ============================== |
|
353 |
|
354 Test setup |
|
355 ---------- |
|
356 |
|
357 $ hg init $TESTTMP/local-fold |
|
358 $ cd $TESTTMP/local-fold |
|
359 $ mkcommit ROOT |
|
360 $ mkcommit A0 |
|
361 $ mkcommit B0 |
|
362 $ hg log --hidden -G |
|
363 @ changeset: 2:0dec01379d3b |
|
364 | tag: tip |
|
365 | user: test |
|
366 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
367 | summary: B0 |
|
368 | |
|
369 o changeset: 1:471f378eab4c |
|
370 | user: test |
|
371 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
372 | summary: A0 |
|
373 | |
|
374 o changeset: 0:ea207398892e |
|
375 user: test |
|
376 date: Thu Jan 01 00:00:00 1970 +0000 |
|
377 summary: ROOT |
|
378 |
|
379 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
|
380 2 changesets folded |
|
381 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
382 $ hg log --hidden -G |
|
383 @ changeset: 3:eb5a0daa2192 |
|
384 | tag: tip |
|
385 | parent: 0:ea207398892e |
|
386 | user: test |
|
387 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
388 | summary: C0 |
|
389 | |
|
390 | x changeset: 2:0dec01379d3b |
|
391 | | user: test |
|
392 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
393 | | summary: B0 |
|
394 | | |
|
395 | x changeset: 1:471f378eab4c |
|
396 |/ user: test |
|
397 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
398 | summary: A0 |
|
399 | |
|
400 o changeset: 0:ea207398892e |
|
401 user: test |
|
402 date: Thu Jan 01 00:00:00 1970 +0000 |
|
403 summary: ROOT |
|
404 |
|
405 Actual test |
|
406 ----------- |
|
407 |
|
408 $ hg update --hidden 'desc(A0)' |
|
409 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
410 working directory parent is obsolete! (471f378eab4c) |
|
411 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
412 $ hg update --hidden 'desc(B0)' |
|
413 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
414 working directory parent is obsolete! (0dec01379d3b) |
|
415 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
416 |
|
417 Test output with divergence |
|
418 =========================== |
|
419 |
|
420 Test setup |
|
421 ---------- |
|
422 |
|
423 $ hg init $TESTTMP/local-divergence |
|
424 $ cd $TESTTMP/local-divergence |
|
425 $ mkcommit ROOT |
|
426 $ mkcommit A0 |
|
427 $ hg amend -m "A1" |
|
428 $ hg log --hidden -G |
|
429 @ changeset: 2:fdf9bde5129a |
|
430 | tag: tip |
|
431 | parent: 0:ea207398892e |
|
432 | user: test |
|
433 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
434 | summary: A1 |
|
435 | |
|
436 | x changeset: 1:471f378eab4c |
|
437 |/ user: test |
|
438 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
439 | summary: A0 |
|
440 | |
|
441 o changeset: 0:ea207398892e |
|
442 user: test |
|
443 date: Thu Jan 01 00:00:00 1970 +0000 |
|
444 summary: ROOT |
|
445 |
|
446 $ hg update --hidden 'desc(A0)' |
|
447 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
448 working directory parent is obsolete! (471f378eab4c) |
|
449 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
|
450 $ hg amend -m "A2" |
|
451 2 new divergent changesets |
|
452 $ hg log --hidden -G |
|
453 @ changeset: 3:65b757b745b9 |
|
454 | tag: tip |
|
455 | parent: 0:ea207398892e |
|
456 | user: test |
|
457 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
458 | trouble: divergent |
|
459 | summary: A2 |
|
460 | |
|
461 | o changeset: 2:fdf9bde5129a |
|
462 |/ parent: 0:ea207398892e |
|
463 | user: test |
|
464 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
465 | trouble: divergent |
|
466 | summary: A1 |
|
467 | |
|
468 | x changeset: 1:471f378eab4c |
|
469 |/ user: test |
|
470 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
471 | summary: A0 |
|
472 | |
|
473 o changeset: 0:ea207398892e |
|
474 user: test |
|
475 date: Thu Jan 01 00:00:00 1970 +0000 |
|
476 summary: ROOT |
|
477 |
|
478 Actual test |
|
479 ----------- |
|
480 |
|
481 $ hg update --hidden 'desc(A0)' |
|
482 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
483 working directory parent is obsolete! (471f378eab4c) |
|
484 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) |