| branch | mercurial-4.1 |
| changeset 3593 | b92114f201c9 |
| parent 3592 | 7a5c3175015e |
| parent 3420 | b21a3753255f |
| 3592:7a5c3175015e | 3593:b92114f201c9 |
|---|---|
14 > [alias] |
14 > [alias] |
15 > tlog = log -G -T '{node|short}\ |
15 > tlog = log -G -T '{node|short}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\n' |
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
|
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
|
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' |
|
23 > EOF |
20 > EOF |
24 |
21 |
25 Test templates on amended commit |
22 Test templates on amended commit |
26 ================================ |
23 ================================ |
27 |
24 |
86 | Precursors: 471f378eab4c |
83 | Precursors: 471f378eab4c |
87 | semi-colon: 471f378eab4c |
84 | semi-colon: 471f378eab4c |
88 | @ 471f378eab4c |
85 | @ 471f378eab4c |
89 |/ Successors: [d004c8f274b9] |
86 |/ Successors: [d004c8f274b9] |
90 | semi-colon: [d004c8f274b9] |
87 | semi-colon: [d004c8f274b9] |
91 | Fate: rewritten as d004c8f274b9 by test, test2 |
88 o ea207398892e |
92 | |
89 |
93 o ea207398892e |
|
94 |
|
95 |
|
96 $ hg log -G |
|
97 o changeset: 4:d004c8f274b9 |
|
98 | tag: tip |
|
99 | parent: 0:ea207398892e |
|
100 | user: test |
|
101 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 | summary: A2 |
|
103 | |
|
104 | @ changeset: 1:471f378eab4c |
|
105 |/ user: test |
|
106 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
107 | summary: A0 |
|
108 | |
|
109 o changeset: 0:ea207398892e |
|
110 user: test |
|
111 date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 summary: ROOT |
|
113 |
|
114 |
|
115 $ hg fatelog -q |
|
116 o d004c8f274b9 |
|
117 | |
|
118 | @ 471f378eab4c |
|
119 |/ Obsfate: rewritten as d004c8f274b9 |
|
120 | |
|
121 o ea207398892e |
|
122 |
|
123 |
|
124 $ hg fatelog |
|
125 o d004c8f274b9 |
|
126 | |
|
127 | @ 471f378eab4c |
|
128 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 |
|
129 | |
|
130 o ea207398892e |
|
131 |
|
132 $ hg fatelog -v |
|
133 o d004c8f274b9 |
|
134 | |
|
135 | @ 471f378eab4c |
|
136 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob) |
|
137 | |
|
138 o ea207398892e |
|
139 |
|
140 |
|
141 (check json) |
|
142 |
|
143 $ hg log -GT '{precursors|json}\n' |
|
144 o ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
145 | |
|
146 | @ [] |
|
147 |/ |
|
148 o [] |
|
149 |
|
150 |
|
151 $ hg log -GT '{successors|json}\n' |
|
152 o "" |
|
153 | |
|
154 | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
155 |/ |
|
156 o "" |
|
157 |
|
158 |
|
159 $ hg up 'desc(A1)' --hidden |
90 $ hg up 'desc(A1)' --hidden |
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 working directory parent is obsolete! (a468dc9b3633) |
92 working directory parent is obsolete! (a468dc9b3633) |
162 (use 'hg evolve' to update to its successor: d004c8f274b9) |
93 (use 'hg evolve' to update to its successor: d004c8f274b9) |
163 |
94 |
167 | Precursors: a468dc9b3633 |
98 | Precursors: a468dc9b3633 |
168 | semi-colon: a468dc9b3633 |
99 | semi-colon: a468dc9b3633 |
169 | @ a468dc9b3633 |
100 | @ a468dc9b3633 |
170 |/ Successors: [d004c8f274b9] |
101 |/ Successors: [d004c8f274b9] |
171 | semi-colon: [d004c8f274b9] |
102 | semi-colon: [d004c8f274b9] |
172 | Fate: reworded as d004c8f274b9 by test2 |
|
173 | |
|
174 o ea207398892e |
103 o ea207398892e |
175 |
104 |
176 Precursors template should show the precursor as we force its display with |
105 Precursors template should show the precursor as we force its display with |
177 --hidden |
106 --hidden |
178 $ hg tlog --hidden |
107 $ hg tlog --hidden |
182 | @ a468dc9b3633 |
111 | @ a468dc9b3633 |
183 |/ Precursors: 471f378eab4c |
112 |/ Precursors: 471f378eab4c |
184 | semi-colon: 471f378eab4c |
113 | semi-colon: 471f378eab4c |
185 | Successors: [d004c8f274b9] |
114 | Successors: [d004c8f274b9] |
186 | semi-colon: [d004c8f274b9] |
115 | semi-colon: [d004c8f274b9] |
187 | Fate: reworded as d004c8f274b9 by test2 |
|
188 | |
|
189 | x f137d23bb3e1 |
116 | x f137d23bb3e1 |
190 | | Fate: pruned |
|
191 | | |
117 | | |
192 | x 471f378eab4c |
118 | x 471f378eab4c |
193 |/ Successors: [a468dc9b3633] |
119 |/ Successors: [a468dc9b3633] |
194 | semi-colon: [a468dc9b3633] |
120 | semi-colon: [a468dc9b3633] |
195 | Fate: rewritten as a468dc9b3633 |
|
196 | |
|
197 o ea207398892e |
|
198 |
|
199 $ hg fatelog -v |
|
200 o d004c8f274b9 |
|
201 | |
|
202 | @ a468dc9b3633 |
|
203 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) |
|
204 | |
|
205 o ea207398892e |
121 o ea207398892e |
206 |
122 |
207 $ hg up 'desc(A2)' |
123 $ hg up 'desc(A2)' |
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
124 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
209 $ hg tlog |
125 $ hg tlog |
218 | x a468dc9b3633 |
134 | x a468dc9b3633 |
219 |/ Precursors: 471f378eab4c |
135 |/ Precursors: 471f378eab4c |
220 | semi-colon: 471f378eab4c |
136 | semi-colon: 471f378eab4c |
221 | Successors: [d004c8f274b9] |
137 | Successors: [d004c8f274b9] |
222 | semi-colon: [d004c8f274b9] |
138 | semi-colon: [d004c8f274b9] |
223 | Fate: reworded as d004c8f274b9 by test2 |
|
224 | |
|
225 | x f137d23bb3e1 |
139 | x f137d23bb3e1 |
226 | | Fate: pruned |
|
227 | | |
140 | | |
228 | x 471f378eab4c |
141 | x 471f378eab4c |
229 |/ Successors: [a468dc9b3633] |
142 |/ Successors: [a468dc9b3633] |
230 | semi-colon: [a468dc9b3633] |
143 | semi-colon: [a468dc9b3633] |
231 | Fate: rewritten as a468dc9b3633 |
144 o ea207398892e |
232 | |
|
233 o ea207398892e |
|
234 |
|
235 $ hg fatelog -v |
|
236 @ d004c8f274b9 |
|
237 | |
|
238 o ea207398892e |
|
239 |
|
240 |
|
241 $ hg fatelog -v --hidden |
|
242 @ d004c8f274b9 |
|
243 | |
|
244 | x a468dc9b3633 |
|
245 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) |
|
246 | |
|
247 | x f137d23bb3e1 |
|
248 | | Obsfate: pruned by test (at *) (glob) |
|
249 | | |
|
250 | x 471f378eab4c |
|
251 |/ Obsfate: rewritten as a468dc9b3633 by test (*) (glob) |
|
252 | |
|
253 o ea207398892e |
|
254 |
|
255 |
|
256 $ hg fatelogjson --hidden |
|
257 @ d004c8f274b9 [] |
|
258 | |
|
259 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob) |
|
260 |/ |
|
261 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob) |
|
262 | | |
|
263 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob) |
|
264 |/ |
|
265 o ea207398892e [] |
|
266 |
145 |
267 |
146 |
268 Test templates with splitted commit |
147 Test templates with splitted commit |
269 =================================== |
148 =================================== |
270 |
149 |
364 | Precursors: 471597cad322 |
243 | Precursors: 471597cad322 |
365 | semi-colon: 471597cad322 |
244 | semi-colon: 471597cad322 |
366 | @ 471597cad322 |
245 | @ 471597cad322 |
367 |/ Successors: [337fec4d2edc, f257fde29c7a] |
246 |/ Successors: [337fec4d2edc, f257fde29c7a] |
368 | semi-colon: [337fec4d2edc, f257fde29c7a] |
247 | semi-colon: [337fec4d2edc, f257fde29c7a] |
369 | Fate: split as 337fec4d2edc, f257fde29c7a |
|
370 | |
|
371 o ea207398892e |
|
372 |
|
373 $ hg fatelog |
|
374 o f257fde29c7a |
|
375 | |
|
376 o 337fec4d2edc |
|
377 | |
|
378 | @ 471597cad322 |
|
379 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
|
380 | |
|
381 o ea207398892e |
248 o ea207398892e |
382 |
249 |
383 |
250 |
384 $ hg up f257fde29c7a |
251 $ hg up f257fde29c7a |
385 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
252 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
403 | Precursors: 471597cad322 |
270 | Precursors: 471597cad322 |
404 | semi-colon: 471597cad322 |
271 | semi-colon: 471597cad322 |
405 | x 471597cad322 |
272 | x 471597cad322 |
406 |/ Successors: [337fec4d2edc, f257fde29c7a] |
273 |/ Successors: [337fec4d2edc, f257fde29c7a] |
407 | semi-colon: [337fec4d2edc, f257fde29c7a] |
274 | semi-colon: [337fec4d2edc, f257fde29c7a] |
408 | Fate: split as 337fec4d2edc, f257fde29c7a |
275 o ea207398892e |
409 | |
276 |
410 o ea207398892e |
|
411 |
|
412 $ hg fatelog --hidden |
|
413 @ f257fde29c7a |
|
414 | |
|
415 o 337fec4d2edc |
|
416 | |
|
417 | x 471597cad322 |
|
418 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
|
419 | |
|
420 o ea207398892e |
|
421 |
|
422 |
|
423 $ hg fatelogjson --hidden |
|
424 @ f257fde29c7a [] |
|
425 | |
|
426 o 337fec4d2edc [] |
|
427 | |
|
428 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob) |
|
429 |/ |
|
430 o ea207398892e [] |
|
431 |
|
432 |
|
433 Test templates with folded commit |
277 Test templates with folded commit |
434 ============================== |
278 ============================== |
435 |
279 |
436 Test setup |
280 Test setup |
437 ---------- |
281 ---------- |
498 | Precursors: 471f378eab4c |
342 | Precursors: 471f378eab4c |
499 | semi-colon: 471f378eab4c |
343 | semi-colon: 471f378eab4c |
500 | @ 471f378eab4c |
344 | @ 471f378eab4c |
501 |/ Successors: [eb5a0daa2192] |
345 |/ Successors: [eb5a0daa2192] |
502 | semi-colon: [eb5a0daa2192] |
346 | semi-colon: [eb5a0daa2192] |
503 | Fate: rewritten as eb5a0daa2192 |
|
504 | |
|
505 o ea207398892e |
|
506 |
|
507 $ hg fatelog |
|
508 o eb5a0daa2192 |
|
509 | |
|
510 | @ 471f378eab4c |
|
511 |/ Obsfate: rewritten as eb5a0daa2192 |
|
512 | |
|
513 o ea207398892e |
347 o ea207398892e |
514 |
348 |
515 $ hg up 'desc(B0)' --hidden |
349 $ hg up 'desc(B0)' --hidden |
516 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
350 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
517 working directory parent is obsolete! (0dec01379d3b) |
351 working directory parent is obsolete! (0dec01379d3b) |
524 | Precursors: 0dec01379d3b 471f378eab4c |
358 | Precursors: 0dec01379d3b 471f378eab4c |
525 | semi-colon: 0dec01379d3b; 471f378eab4c |
359 | semi-colon: 0dec01379d3b; 471f378eab4c |
526 | @ 0dec01379d3b |
360 | @ 0dec01379d3b |
527 | | Successors: [eb5a0daa2192] |
361 | | Successors: [eb5a0daa2192] |
528 | | semi-colon: [eb5a0daa2192] |
362 | | semi-colon: [eb5a0daa2192] |
529 | | Fate: rewritten as eb5a0daa2192 |
|
530 | | |
|
531 | x 471f378eab4c |
363 | x 471f378eab4c |
532 |/ Successors: [eb5a0daa2192] |
364 |/ Successors: [eb5a0daa2192] |
533 | semi-colon: [eb5a0daa2192] |
365 | semi-colon: [eb5a0daa2192] |
534 | Fate: rewritten as eb5a0daa2192 |
366 o ea207398892e |
535 | |
367 |
536 o ea207398892e |
|
537 |
|
538 $ hg fatelog |
|
539 o eb5a0daa2192 |
|
540 | |
|
541 | @ 0dec01379d3b |
|
542 | | Obsfate: rewritten as eb5a0daa2192 |
|
543 | | |
|
544 | x 471f378eab4c |
|
545 |/ Obsfate: rewritten as eb5a0daa2192 |
|
546 | |
|
547 o ea207398892e |
|
548 |
|
549 |
|
550 $ hg up 'desc(C0)' |
368 $ hg up 'desc(C0)' |
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
369 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
552 |
370 |
553 Precursors template should not show precursors as it's not displayed in the |
371 Precursors template should not show precursors as it's not displayed in the |
554 log |
372 log |
564 | Precursors: 0dec01379d3b 471f378eab4c |
382 | Precursors: 0dec01379d3b 471f378eab4c |
565 | semi-colon: 0dec01379d3b; 471f378eab4c |
383 | semi-colon: 0dec01379d3b; 471f378eab4c |
566 | x 0dec01379d3b |
384 | x 0dec01379d3b |
567 | | Successors: [eb5a0daa2192] |
385 | | Successors: [eb5a0daa2192] |
568 | | semi-colon: [eb5a0daa2192] |
386 | | semi-colon: [eb5a0daa2192] |
569 | | Fate: rewritten as eb5a0daa2192 |
|
570 | | |
|
571 | x 471f378eab4c |
387 | x 471f378eab4c |
572 |/ Successors: [eb5a0daa2192] |
388 |/ Successors: [eb5a0daa2192] |
573 | semi-colon: [eb5a0daa2192] |
389 | semi-colon: [eb5a0daa2192] |
574 | Fate: rewritten as eb5a0daa2192 |
390 o ea207398892e |
575 | |
|
576 o ea207398892e |
|
577 |
|
578 $ hg fatelog --hidden |
|
579 @ eb5a0daa2192 |
|
580 | |
|
581 | x 0dec01379d3b |
|
582 | | Obsfate: rewritten as eb5a0daa2192 |
|
583 | | |
|
584 | x 471f378eab4c |
|
585 |/ Obsfate: rewritten as eb5a0daa2192 |
|
586 | |
|
587 o ea207398892e |
|
588 |
|
589 |
|
590 $ hg fatelogjson --hidden |
|
591 @ eb5a0daa2192 [] |
|
592 | |
|
593 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |
|
594 | | |
|
595 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |
|
596 |/ |
|
597 o ea207398892e [] |
|
598 |
391 |
599 |
392 |
600 Test templates with divergence |
393 Test templates with divergence |
601 ============================== |
394 ============================== |
602 |
395 |
677 |/ Precursors: 471f378eab4c |
470 |/ Precursors: 471f378eab4c |
678 | semi-colon: 471f378eab4c |
471 | semi-colon: 471f378eab4c |
679 | @ 471f378eab4c |
472 | @ 471f378eab4c |
680 |/ Successors: [fdf9bde5129a], [019fadeab383] |
473 |/ Successors: [fdf9bde5129a], [019fadeab383] |
681 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
474 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
682 | Fate: reworded as fdf9bde5129a |
475 o ea207398892e |
683 | Fate: reworded as 019fadeab383 |
476 |
684 | |
|
685 o ea207398892e |
|
686 |
|
687 $ hg fatelog |
|
688 o 019fadeab383 |
|
689 | |
|
690 | o fdf9bde5129a |
|
691 |/ |
|
692 | @ 471f378eab4c |
|
693 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 |
|
694 | |
|
695 o ea207398892e |
|
696 |
|
697 |
|
698 $ hg up 'desc(A1)' |
477 $ hg up 'desc(A1)' |
699 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
478 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
700 Precursors template should not show precursors as it's not displayed in the |
479 Precursors template should not show precursors as it's not displayed in the |
701 log |
480 log |
702 $ hg tlog |
481 $ hg tlog |
705 | @ fdf9bde5129a |
484 | @ fdf9bde5129a |
706 |/ |
485 |/ |
707 o ea207398892e |
486 o ea207398892e |
708 |
487 |
709 |
488 |
710 $ hg fatelog |
|
711 o 019fadeab383 |
|
712 | |
|
713 | @ fdf9bde5129a |
|
714 |/ |
|
715 o ea207398892e |
|
716 |
|
717 Precursors template should a precursor as we force its display with --hidden |
489 Precursors template should a precursor as we force its display with --hidden |
718 $ hg tlog --hidden |
490 $ hg tlog --hidden |
719 o 019fadeab383 |
491 o 019fadeab383 |
720 | Precursors: 65b757b745b9 |
492 | Precursors: 65b757b745b9 |
721 | semi-colon: 65b757b745b9 |
493 | semi-colon: 65b757b745b9 |
722 | x 65b757b745b9 |
494 | x 65b757b745b9 |
723 |/ Precursors: 471f378eab4c |
495 |/ Precursors: 471f378eab4c |
724 | semi-colon: 471f378eab4c |
496 | semi-colon: 471f378eab4c |
725 | Successors: [019fadeab383] |
497 | Successors: [019fadeab383] |
726 | semi-colon: [019fadeab383] |
498 | semi-colon: [019fadeab383] |
727 | Fate: reworded as 019fadeab383 |
|
728 | |
|
729 | @ fdf9bde5129a |
499 | @ fdf9bde5129a |
730 |/ Precursors: 471f378eab4c |
500 |/ Precursors: 471f378eab4c |
731 | semi-colon: 471f378eab4c |
501 | semi-colon: 471f378eab4c |
732 | x 471f378eab4c |
502 | x 471f378eab4c |
733 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
503 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
734 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
504 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
735 | Fate: reworded as fdf9bde5129a |
505 o ea207398892e |
736 | Fate: reworded as 65b757b745b9 |
|
737 | |
|
738 o ea207398892e |
|
739 |
|
740 $ hg fatelog --hidden |
|
741 o 019fadeab383 |
|
742 | |
|
743 | x 65b757b745b9 |
|
744 |/ Obsfate: reworded as 019fadeab383 |
|
745 | |
|
746 | @ fdf9bde5129a |
|
747 |/ |
|
748 | x 471f378eab4c |
|
749 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 |
|
750 | |
|
751 o ea207398892e |
|
752 |
|
753 |
|
754 $ hg fatelogjson --hidden |
|
755 o 019fadeab383 [] |
|
756 | |
|
757 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob) |
|
758 |/ |
|
759 | @ fdf9bde5129a [] |
|
760 |/ |
|
761 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob) |
|
762 |/ |
|
763 o ea207398892e [] |
|
764 |
506 |
765 |
507 |
766 Test templates with amended + folded commit |
508 Test templates with amended + folded commit |
767 =========================================== |
509 =========================================== |
768 |
510 |
842 | Precursors: 471f378eab4c |
584 | Precursors: 471f378eab4c |
843 | semi-colon: 471f378eab4c |
585 | semi-colon: 471f378eab4c |
844 | @ 471f378eab4c |
586 | @ 471f378eab4c |
845 |/ Successors: [eb5a0daa2192] |
587 |/ Successors: [eb5a0daa2192] |
846 | semi-colon: [eb5a0daa2192] |
588 | semi-colon: [eb5a0daa2192] |
847 | Fate: rewritten as eb5a0daa2192 |
|
848 | |
|
849 o ea207398892e |
|
850 |
|
851 $ hg fatelog |
|
852 o eb5a0daa2192 |
|
853 | |
|
854 | @ 471f378eab4c |
|
855 |/ Obsfate: rewritten as eb5a0daa2192 |
|
856 | |
|
857 o ea207398892e |
589 o ea207398892e |
858 |
590 |
859 $ hg up 'desc(B0)' --hidden |
591 $ hg up 'desc(B0)' --hidden |
860 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
592 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
861 working directory parent is obsolete! (0dec01379d3b) |
593 working directory parent is obsolete! (0dec01379d3b) |
865 | Precursors: 0dec01379d3b 471f378eab4c |
597 | Precursors: 0dec01379d3b 471f378eab4c |
866 | semi-colon: 0dec01379d3b; 471f378eab4c |
598 | semi-colon: 0dec01379d3b; 471f378eab4c |
867 | @ 0dec01379d3b |
599 | @ 0dec01379d3b |
868 | | Successors: [eb5a0daa2192] |
600 | | Successors: [eb5a0daa2192] |
869 | | semi-colon: [eb5a0daa2192] |
601 | | semi-colon: [eb5a0daa2192] |
870 | | Fate: rewritten as eb5a0daa2192 |
|
871 | | |
|
872 | x 471f378eab4c |
602 | x 471f378eab4c |
873 |/ Successors: [eb5a0daa2192] |
603 |/ Successors: [eb5a0daa2192] |
874 | semi-colon: [eb5a0daa2192] |
604 | semi-colon: [eb5a0daa2192] |
875 | Fate: rewritten as eb5a0daa2192 |
|
876 | |
|
877 o ea207398892e |
|
878 |
|
879 $ hg fatelog |
|
880 o eb5a0daa2192 |
|
881 | |
|
882 | @ 0dec01379d3b |
|
883 | | Obsfate: rewritten as eb5a0daa2192 |
|
884 | | |
|
885 | x 471f378eab4c |
|
886 |/ Obsfate: rewritten as eb5a0daa2192 |
|
887 | |
|
888 o ea207398892e |
605 o ea207398892e |
889 |
606 |
890 |
607 |
891 $ hg up 'desc(B1)' --hidden |
608 $ hg up 'desc(B1)' --hidden |
892 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
609 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
897 | Precursors: 471f378eab4c b7ea6d14e664 |
614 | Precursors: 471f378eab4c b7ea6d14e664 |
898 | semi-colon: 471f378eab4c; b7ea6d14e664 |
615 | semi-colon: 471f378eab4c; b7ea6d14e664 |
899 | @ b7ea6d14e664 |
616 | @ b7ea6d14e664 |
900 | | Successors: [eb5a0daa2192] |
617 | | Successors: [eb5a0daa2192] |
901 | | semi-colon: [eb5a0daa2192] |
618 | | semi-colon: [eb5a0daa2192] |
902 | | Fate: rewritten as eb5a0daa2192 |
|
903 | | |
|
904 | x 471f378eab4c |
619 | x 471f378eab4c |
905 |/ Successors: [eb5a0daa2192] |
620 |/ Successors: [eb5a0daa2192] |
906 | semi-colon: [eb5a0daa2192] |
621 | semi-colon: [eb5a0daa2192] |
907 | Fate: rewritten as eb5a0daa2192 |
|
908 | |
|
909 o ea207398892e |
|
910 |
|
911 $ hg fatelog |
|
912 o eb5a0daa2192 |
|
913 | |
|
914 | @ b7ea6d14e664 |
|
915 | | Obsfate: rewritten as eb5a0daa2192 |
|
916 | | |
|
917 | x 471f378eab4c |
|
918 |/ Obsfate: rewritten as eb5a0daa2192 |
|
919 | |
|
920 o ea207398892e |
622 o ea207398892e |
921 |
623 |
922 |
624 |
923 $ hg up 'desc(C0)' |
625 $ hg up 'desc(C0)' |
924 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
626 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
934 | x b7ea6d14e664 |
636 | x b7ea6d14e664 |
935 | | Precursors: 0dec01379d3b |
637 | | Precursors: 0dec01379d3b |
936 | | semi-colon: 0dec01379d3b |
638 | | semi-colon: 0dec01379d3b |
937 | | Successors: [eb5a0daa2192] |
639 | | Successors: [eb5a0daa2192] |
938 | | semi-colon: [eb5a0daa2192] |
640 | | semi-colon: [eb5a0daa2192] |
939 | | Fate: rewritten as eb5a0daa2192 |
|
940 | | |
|
941 | | x 0dec01379d3b |
641 | | x 0dec01379d3b |
942 | |/ Successors: [b7ea6d14e664] |
642 | |/ Successors: [b7ea6d14e664] |
943 | | semi-colon: [b7ea6d14e664] |
643 | | semi-colon: [b7ea6d14e664] |
944 | | Fate: reworded as b7ea6d14e664 |
|
945 | | |
|
946 | x 471f378eab4c |
644 | x 471f378eab4c |
947 |/ Successors: [eb5a0daa2192] |
645 |/ Successors: [eb5a0daa2192] |
948 | semi-colon: [eb5a0daa2192] |
646 | semi-colon: [eb5a0daa2192] |
949 | Fate: rewritten as eb5a0daa2192 |
647 o ea207398892e |
950 | |
648 |
951 o ea207398892e |
|
952 |
|
953 $ hg fatelog --hidden |
|
954 @ eb5a0daa2192 |
|
955 | |
|
956 | x b7ea6d14e664 |
|
957 | | Obsfate: rewritten as eb5a0daa2192 |
|
958 | | |
|
959 | | x 0dec01379d3b |
|
960 | |/ Obsfate: reworded as b7ea6d14e664 |
|
961 | | |
|
962 | x 471f378eab4c |
|
963 |/ Obsfate: rewritten as eb5a0daa2192 |
|
964 | |
|
965 o ea207398892e |
|
966 |
|
967 $ hg fatelogjson --hidden |
|
968 @ eb5a0daa2192 [] |
|
969 | |
|
970 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |
|
971 | | |
|
972 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob) |
|
973 | |/ |
|
974 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |
|
975 |/ |
|
976 o ea207398892e [] |
|
977 |
|
978 |
|
979 Test template with pushed and pulled obs markers |
649 Test template with pushed and pulled obs markers |
980 ============================================== |
650 ============================================== |
981 |
651 |
982 Test setup |
652 Test setup |
983 ---------- |
653 ---------- |
1067 | Precursors: 471f378eab4c |
737 | Precursors: 471f378eab4c |
1068 | semi-colon: 471f378eab4c |
738 | semi-colon: 471f378eab4c |
1069 | @ 471f378eab4c |
739 | @ 471f378eab4c |
1070 |/ Successors: [7a230b46bf61] |
740 |/ Successors: [7a230b46bf61] |
1071 | semi-colon: [7a230b46bf61] |
741 | semi-colon: [7a230b46bf61] |
1072 | Fate: reworded as 7a230b46bf61 |
|
1073 | |
|
1074 o ea207398892e |
|
1075 |
|
1076 $ hg fatelog --hidden -v |
|
1077 o 7a230b46bf61 |
|
1078 | |
|
1079 | @ 471f378eab4c |
|
1080 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) |
|
1081 | |
|
1082 o ea207398892e |
|
1083 |
|
1084 $ hg up 'desc(A2)' |
|
1085 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1086 $ hg tlog |
|
1087 @ 7a230b46bf61 |
|
1088 | |
|
1089 o ea207398892e |
|
1090 |
|
1091 $ hg fatelog -v |
|
1092 @ 7a230b46bf61 |
|
1093 | |
|
1094 o ea207398892e |
|
1095 |
|
1096 $ hg tlog --hidden |
|
1097 @ 7a230b46bf61 |
|
1098 | Precursors: 471f378eab4c |
|
1099 | semi-colon: 471f378eab4c |
|
1100 | x 471f378eab4c |
|
1101 |/ Successors: [7a230b46bf61] |
|
1102 | semi-colon: [7a230b46bf61] |
|
1103 | Fate: reworded as 7a230b46bf61 |
|
1104 | |
|
1105 o ea207398892e |
|
1106 |
|
1107 $ hg fatelog --hidden -v |
|
1108 @ 7a230b46bf61 |
|
1109 | |
|
1110 | x 471f378eab4c |
|
1111 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) |
|
1112 | |
|
1113 o ea207398892e |
|
1114 |
|
1115 |
|
1116 $ hg fatelogjson --hidden |
|
1117 @ 7a230b46bf61 [] |
|
1118 | |
|
1119 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) |
|
1120 |/ |
|
1121 o ea207398892e [] |
|
1122 |
|
1123 |
|
1124 Test template with obsmarkers cycle |
|
1125 =================================== |
|
1126 |
|
1127 Test setup |
|
1128 ---------- |
|
1129 |
|
1130 $ hg init $TESTTMP/templates-local-cycle |
|
1131 $ cd $TESTTMP/templates-local-cycle |
|
1132 $ mkcommit ROOT |
|
1133 $ mkcommit A0 |
|
1134 $ mkcommit B0 |
|
1135 $ hg up -r 0 |
|
1136 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1137 $ mkcommit C0 |
|
1138 created new head |
|
1139 |
|
1140 Create the cycle |
|
1141 |
|
1142 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1143 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1144 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1145 |
|
1146 Check templates |
|
1147 --------------- |
|
1148 |
|
1149 $ hg tlog |
|
1150 @ f897c6137566 |
|
1151 | |
|
1152 o ea207398892e |
|
1153 |
|
1154 $ hg fatelog |
|
1155 @ f897c6137566 |
|
1156 | |
|
1157 o ea207398892e |
|
1158 |
|
1159 $ hg up -r "desc(B0)" --hidden |
|
1160 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1161 working directory parent is obsolete! (0dec01379d3b) |
|
1162 (use 'hg evolve' to update to its parent successor) |
|
1163 $ hg tlog |
|
1164 o f897c6137566 |
|
1165 | Precursors: 0dec01379d3b |
|
1166 | semi-colon: 0dec01379d3b |
|
1167 | @ 0dec01379d3b |
|
1168 | | Precursors: 471f378eab4c |
|
1169 | | semi-colon: 471f378eab4c |
|
1170 | | Successors: [f897c6137566], [471f378eab4c] |
|
1171 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1172 | | Fate: rewritten as f897c6137566 |
|
1173 | | Fate: rewritten as 471f378eab4c |
|
1174 | | |
|
1175 | x 471f378eab4c |
|
1176 |/ Precursors: 0dec01379d3b |
|
1177 | semi-colon: 0dec01379d3b |
|
1178 | Successors: [0dec01379d3b] |
|
1179 | semi-colon: [0dec01379d3b] |
|
1180 | Fate: rewritten as 0dec01379d3b |
|
1181 | |
|
1182 o ea207398892e |
|
1183 |
|
1184 $ hg fatelog |
|
1185 o f897c6137566 |
|
1186 | |
|
1187 | @ 0dec01379d3b |
|
1188 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
|
1189 | | |
|
1190 | x 471f378eab4c |
|
1191 |/ Obsfate: rewritten as 0dec01379d3b |
|
1192 | |
|
1193 o ea207398892e |
|
1194 |
|
1195 $ hg up -r "desc(A0)" --hidden |
|
1196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1197 working directory parent is obsolete! (471f378eab4c) |
|
1198 (use 'hg evolve' to update to its parent successor) |
|
1199 $ hg tlog |
|
1200 o f897c6137566 |
|
1201 | Precursors: 471f378eab4c |
|
1202 | semi-colon: 471f378eab4c |
|
1203 | @ 471f378eab4c |
|
1204 |/ Fate: pruned |
|
1205 | |
|
1206 o ea207398892e |
|
1207 |
|
1208 $ hg fatelog |
|
1209 o f897c6137566 |
|
1210 | |
|
1211 | @ 471f378eab4c |
|
1212 |/ Obsfate: pruned |
|
1213 | |
|
1214 o ea207398892e |
|
1215 |
|
1216 |
|
1217 $ hg up -r "desc(ROOT)" --hidden |
|
1218 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1219 $ hg tlog |
|
1220 o f897c6137566 |
|
1221 | |
|
1222 @ ea207398892e |
|
1223 |
|
1224 $ hg fatelog |
|
1225 o f897c6137566 |
|
1226 | |
|
1227 @ ea207398892e |
|
1228 |
|
1229 $ hg tlog --hidden |
|
1230 o f897c6137566 |
|
1231 | Precursors: 0dec01379d3b |
|
1232 | semi-colon: 0dec01379d3b |
|
1233 | x 0dec01379d3b |
|
1234 | | Precursors: 471f378eab4c |
|
1235 | | semi-colon: 471f378eab4c |
|
1236 | | Successors: [f897c6137566], [471f378eab4c] |
|
1237 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1238 | | Fate: rewritten as f897c6137566 |
|
1239 | | Fate: rewritten as 471f378eab4c |
|
1240 | | |
|
1241 | x 471f378eab4c |
|
1242 |/ Precursors: 0dec01379d3b |
|
1243 | semi-colon: 0dec01379d3b |
|
1244 | Successors: [0dec01379d3b] |
|
1245 | semi-colon: [0dec01379d3b] |
|
1246 | Fate: rewritten as 0dec01379d3b |
|
1247 | |
|
1248 @ ea207398892e |
|
1249 |
|
1250 Test template with split + divergence with cycles |
|
1251 ================================================= |
|
1252 |
|
1253 $ hg log -G |
|
1254 o changeset: 3:f897c6137566 |
|
1255 | tag: tip |
|
1256 | parent: 0:ea207398892e |
|
1257 | user: test |
|
1258 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1259 | summary: C0 |
|
1260 | |
|
1261 @ changeset: 0:ea207398892e |
|
1262 user: test |
|
1263 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1264 summary: ROOT |
|
1265 |
|
1266 $ hg up |
|
1267 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1268 |
|
1269 Create a commit with three files |
|
1270 $ touch A B C |
|
1271 $ hg commit -A -m "Add A,B,C" A B C |
|
1272 |
|
1273 Split it |
|
1274 $ hg up 3 |
|
1275 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1276 $ touch A |
|
1277 $ hg commit -A -m "Add A,B,C" A |
|
1278 created new head |
|
1279 |
|
1280 $ touch B |
|
1281 $ hg commit -A -m "Add A,B,C" B |
|
1282 |
|
1283 $ touch C |
|
1284 $ hg commit -A -m "Add A,B,C" C |
|
1285 |
|
1286 $ hg log -G |
|
1287 @ changeset: 7:ba2ed02b0c9a |
|
1288 | tag: tip |
|
1289 | user: test |
|
1290 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1291 | summary: Add A,B,C |
|
1292 | |
|
1293 o changeset: 6:4a004186e638 |
|
1294 | user: test |
|
1295 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1296 | summary: Add A,B,C |
|
1297 | |
|
1298 o changeset: 5:dd800401bd8c |
|
1299 | parent: 3:f897c6137566 |
|
1300 | user: test |
|
1301 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1302 | summary: Add A,B,C |
|
1303 | |
|
1304 | o changeset: 4:9bd10a0775e4 |
|
1305 |/ user: test |
|
1306 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1307 | summary: Add A,B,C |
|
1308 | |
|
1309 o changeset: 3:f897c6137566 |
|
1310 | parent: 0:ea207398892e |
|
1311 | user: test |
|
1312 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1313 | summary: C0 |
|
1314 | |
|
1315 o changeset: 0:ea207398892e |
|
1316 user: test |
|
1317 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1318 summary: ROOT |
|
1319 |
|
1320 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1321 $ hg log -G |
|
1322 @ changeset: 7:ba2ed02b0c9a |
|
1323 | tag: tip |
|
1324 | user: test |
|
1325 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1326 | summary: Add A,B,C |
|
1327 | |
|
1328 o changeset: 6:4a004186e638 |
|
1329 | user: test |
|
1330 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1331 | summary: Add A,B,C |
|
1332 | |
|
1333 o changeset: 5:dd800401bd8c |
|
1334 | parent: 3:f897c6137566 |
|
1335 | user: test |
|
1336 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1337 | summary: Add A,B,C |
|
1338 | |
|
1339 o changeset: 3:f897c6137566 |
|
1340 | parent: 0:ea207398892e |
|
1341 | user: test |
|
1342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1343 | summary: C0 |
|
1344 | |
|
1345 o changeset: 0:ea207398892e |
|
1346 user: test |
|
1347 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1348 summary: ROOT |
|
1349 |
|
1350 Diverge one of the splitted commit |
|
1351 |
|
1352 $ hg up 6 |
|
1353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1354 $ hg commit --amend -m "Add only B" |
|
1355 1 new unstable changesets |
|
1356 |
|
1357 $ hg up 6 --hidden |
|
1358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1359 working directory parent is obsolete! (4a004186e638) |
|
1360 (use 'hg evolve' to update to its successor: b18bc8331526) |
|
1361 $ hg commit --amend -m "Add B only" |
|
1362 4 new divergent changesets |
|
1363 |
|
1364 $ hg log -G |
|
1365 @ changeset: 9:0b997eb7ceee |
|
1366 | tag: tip |
|
1367 | parent: 5:dd800401bd8c |
|
1368 | user: test |
|
1369 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1370 | trouble: divergent |
|
1371 | summary: Add B only |
|
1372 | |
|
1373 | o changeset: 8:b18bc8331526 |
|
1374 |/ parent: 5:dd800401bd8c |
|
1375 | user: test |
|
1376 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1377 | trouble: divergent |
|
1378 | summary: Add only B |
|
1379 | |
|
1380 | o changeset: 7:ba2ed02b0c9a |
|
1381 | | user: test |
|
1382 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1383 | | trouble: unstable, divergent |
|
1384 | | summary: Add A,B,C |
|
1385 | | |
|
1386 | x changeset: 6:4a004186e638 |
|
1387 |/ user: test |
|
1388 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1389 | summary: Add A,B,C |
|
1390 | |
|
1391 o changeset: 5:dd800401bd8c |
|
1392 | parent: 3:f897c6137566 |
|
1393 | user: test |
|
1394 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1395 | trouble: divergent |
|
1396 | summary: Add A,B,C |
|
1397 | |
|
1398 o changeset: 3:f897c6137566 |
|
1399 | parent: 0:ea207398892e |
|
1400 | user: test |
|
1401 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1402 | summary: C0 |
|
1403 | |
|
1404 o changeset: 0:ea207398892e |
|
1405 user: test |
|
1406 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1407 summary: ROOT |
|
1408 |
|
1409 Check templates |
|
1410 --------------- |
|
1411 |
|
1412 $ hg tlog |
|
1413 @ 0b997eb7ceee |
|
1414 | Precursors: 4a004186e638 |
|
1415 | semi-colon: 4a004186e638 |
|
1416 | o b18bc8331526 |
|
1417 |/ Precursors: 4a004186e638 |
|
1418 | semi-colon: 4a004186e638 |
|
1419 | o ba2ed02b0c9a |
|
1420 | | |
|
1421 | x 4a004186e638 |
|
1422 |/ Successors: [b18bc8331526], [0b997eb7ceee] |
|
1423 | semi-colon: [b18bc8331526]; [0b997eb7ceee] |
|
1424 | Fate: reworded as b18bc8331526 |
|
1425 | Fate: reworded as 0b997eb7ceee |
|
1426 | |
|
1427 o dd800401bd8c |
|
1428 | |
|
1429 o f897c6137566 |
|
1430 | |
|
1431 o ea207398892e |
|
1432 |
|
1433 $ hg fatelog |
|
1434 @ 0b997eb7ceee |
|
1435 | |
|
1436 | o b18bc8331526 |
|
1437 |/ |
|
1438 | o ba2ed02b0c9a |
|
1439 | | |
|
1440 | x 4a004186e638 |
|
1441 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
|
1442 | |
|
1443 o dd800401bd8c |
|
1444 | |
|
1445 o f897c6137566 |
|
1446 | |
|
1447 o ea207398892e |
|
1448 |
|
1449 $ hg tlog --hidden |
|
1450 @ 0b997eb7ceee |
|
1451 | Precursors: 4a004186e638 |
|
1452 | semi-colon: 4a004186e638 |
|
1453 | o b18bc8331526 |
|
1454 |/ Precursors: 4a004186e638 |
|
1455 | semi-colon: 4a004186e638 |
|
1456 | o ba2ed02b0c9a |
|
1457 | | Precursors: 9bd10a0775e4 |
|
1458 | | semi-colon: 9bd10a0775e4 |
|
1459 | x 4a004186e638 |
|
1460 |/ Precursors: 9bd10a0775e4 |
|
1461 | semi-colon: 9bd10a0775e4 |
|
1462 | Successors: [b18bc8331526], [0b997eb7ceee] |
|
1463 | semi-colon: [b18bc8331526]; [0b997eb7ceee] |
|
1464 | Fate: reworded as b18bc8331526 |
|
1465 | Fate: reworded as 0b997eb7ceee |
|
1466 | |
|
1467 o dd800401bd8c |
|
1468 | Precursors: 9bd10a0775e4 |
|
1469 | semi-colon: 9bd10a0775e4 |
|
1470 | x 9bd10a0775e4 |
|
1471 |/ Successors: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a] |
|
1472 | semi-colon: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a] |
|
1473 | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
|
1474 | |
|
1475 o f897c6137566 |
|
1476 | Precursors: 0dec01379d3b |
|
1477 | semi-colon: 0dec01379d3b |
|
1478 | x 0dec01379d3b |
|
1479 | | Precursors: 471f378eab4c |
|
1480 | | semi-colon: 471f378eab4c |
|
1481 | | Successors: [f897c6137566], [471f378eab4c] |
|
1482 | | semi-colon: [f897c6137566]; [471f378eab4c] |
|
1483 | | Fate: rewritten as f897c6137566 |
|
1484 | | Fate: rewritten as 471f378eab4c |
|
1485 | | |
|
1486 | x 471f378eab4c |
|
1487 |/ Precursors: 0dec01379d3b |
|
1488 | semi-colon: 0dec01379d3b |
|
1489 | Successors: [0dec01379d3b] |
|
1490 | semi-colon: [0dec01379d3b] |
|
1491 | Fate: rewritten as 0dec01379d3b |
|
1492 | |
|
1493 o ea207398892e |
|
1494 |
|
1495 $ hg fatelog --hidden |
|
1496 @ 0b997eb7ceee |
|
1497 | |
|
1498 | o b18bc8331526 |
|
1499 |/ |
|
1500 | o ba2ed02b0c9a |
|
1501 | | |
|
1502 | x 4a004186e638 |
|
1503 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
|
1504 | |
|
1505 o dd800401bd8c |
|
1506 | |
|
1507 | x 9bd10a0775e4 |
|
1508 |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
|
1509 | |
|
1510 o f897c6137566 |
|
1511 | |
|
1512 | x 0dec01379d3b |
|
1513 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
|
1514 | | |
|
1515 | x 471f378eab4c |
|
1516 |/ Obsfate: rewritten as 0dec01379d3b |
|
1517 | |
|
1518 o ea207398892e |
|
1519 |
|
1520 $ hg up --hidden 4 |
|
1521 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1522 working directory parent is obsolete! (9bd10a0775e4) |
|
1523 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
|
1524 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
1525 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
|
1526 $ hg tlog |
|
1527 o eceed8f98ffc |
|
1528 | Precursors: 9bd10a0775e4 |
|
1529 | semi-colon: 9bd10a0775e4 |
|
1530 | o 0b997eb7ceee |
|
1531 | | Precursors: 9bd10a0775e4 |
|
1532 | | semi-colon: 9bd10a0775e4 |
|
1533 o | b18bc8331526 |
|
1534 |/ Precursors: 9bd10a0775e4 |
|
1535 | semi-colon: 9bd10a0775e4 |
|
1536 o dd800401bd8c |
|
1537 | Precursors: 9bd10a0775e4 |
|
1538 | semi-colon: 9bd10a0775e4 |
|
1539 | @ 9bd10a0775e4 |
|
1540 |/ Successors: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc], [dd800401bd8c, b18bc8331526, eceed8f98ffc] |
|
1541 | semi-colon: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc]; [dd800401bd8c, b18bc8331526, eceed8f98ffc] |
|
1542 | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc |
|
1543 | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
|
1544 | |
|
1545 o f897c6137566 |
|
1546 | |
|
1547 o ea207398892e |
|
1548 |
|
1549 $ hg fatelog |
|
1550 o eceed8f98ffc |
|
1551 | |
|
1552 | o 0b997eb7ceee |
|
1553 | | |
|
1554 o | b18bc8331526 |
|
1555 |/ |
|
1556 o dd800401bd8c |
|
1557 | |
|
1558 | @ 9bd10a0775e4 |
|
1559 |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
|
1560 | |
|
1561 o f897c6137566 |
|
1562 | |
|
1563 o ea207398892e |
742 o ea207398892e |
1564 |
743 |
1565 Test templates with pruned commits |
744 Test templates with pruned commits |
1566 ================================== |
745 ================================== |
1567 |
746 |
1584 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
763 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1585 working directory parent is obsolete! (471f378eab4c) |
764 working directory parent is obsolete! (471f378eab4c) |
1586 (use 'hg evolve' to update to its parent successor) |
765 (use 'hg evolve' to update to its parent successor) |
1587 $ hg tlog |
766 $ hg tlog |
1588 @ 471f378eab4c |
767 @ 471f378eab4c |
1589 | Fate: pruned |
768 | |
1590 | |
769 o ea207398892e |
1591 o ea207398892e |
770 |
1592 |
|
1593 $ hg fatelog -v |
|
1594 @ 471f378eab4c |
|
1595 | Obsfate: pruned by test (at *) (glob) |
|
1596 | |
|
1597 o ea207398892e |
|
1598 |