comparison tests/test-evolve-templates.t @ 3098:87b83a3e0392 mercurial-4.3

test-compat: revert output change from using core obsfate The output update arrives in e91ca8b5ecf7. This output is only relevant for Mercurial 4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 17:23:12 +0200
parents e91ca8b5ecf7
children 13cafb250c1a
comparison
equal deleted inserted replaced
3097:f06c86fd2ffd 3098:87b83a3e0392
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, "; ")}")}\
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\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")}' 21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}'
22 > fatelogjson = log -G -T '{node|short} {obsfatedata|json}\n' 22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
23 > EOF 23 > EOF
24 24
25 Test templates on amended commit 25 Test templates on amended commit
26 ================================ 26 ================================
27 27
45 | 45 |
46 | x changeset: 2:a468dc9b3633 46 | x changeset: 2:a468dc9b3633
47 |/ parent: 0:ea207398892e 47 |/ parent: 0:ea207398892e
48 | user: test 48 | user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000 49 | date: Thu Jan 01 00:00:00 1970 +0000
50 | obsolete: reworded as 3:d004c8f274b9 by test2 50 | obsolete: reworded as d004c8f274b9 by test2
51 | summary: A1 51 | summary: A1
52 | 52 |
53 | x changeset: 1:471f378eab4c 53 | x changeset: 1:471f378eab4c
54 |/ user: test 54 |/ user: test
55 | date: Thu Jan 01 00:00:00 1970 +0000 55 | date: Thu Jan 01 00:00:00 1970 +0000
56 | obsolete: rewritten as 2:a468dc9b3633 56 | obsolete: rewritten as a468dc9b3633
57 | summary: A0 57 | summary: A0
58 | 58 |
59 o changeset: 0:ea207398892e 59 o changeset: 0:ea207398892e
60 user: test 60 user: test
61 date: Thu Jan 01 00:00:00 1970 +0000 61 date: Thu Jan 01 00:00:00 1970 +0000
81 $ hg tlog 81 $ hg tlog
82 o d004c8f274b9 82 o d004c8f274b9
83 | Precursors: 1:471f378eab4c 83 | Precursors: 1:471f378eab4c
84 | semi-colon: 1:471f378eab4c 84 | semi-colon: 1:471f378eab4c
85 | @ 471f378eab4c 85 | @ 471f378eab4c
86 |/ Successors: 3:d004c8f274b9 86 |/ Successors: 4:d004c8f274b9
87 | semi-colon: 3:d004c8f274b9 87 | semi-colon: 4:d004c8f274b9
88 | Fate: rewritten as 3:d004c8f274b9 by test, test2 88 | Fate: rewritten as d004c8f274b9 by test, test2
89 | 89 |
90 o ea207398892e 90 o ea207398892e
91 91
92 92
93 $ hg log -G 93 $ hg log -G
94 o changeset: 3:d004c8f274b9 94 o changeset: 4:d004c8f274b9
95 | tag: tip 95 | tag: tip
96 | parent: 0:ea207398892e 96 | parent: 0:ea207398892e
97 | user: test 97 | user: test
98 | date: Thu Jan 01 00:00:00 1970 +0000 98 | date: Thu Jan 01 00:00:00 1970 +0000
99 | summary: A2 99 | summary: A2
100 | 100 |
101 | @ changeset: 1:471f378eab4c 101 | @ changeset: 1:471f378eab4c
102 |/ user: test 102 |/ user: test
103 | date: Thu Jan 01 00:00:00 1970 +0000 103 | date: Thu Jan 01 00:00:00 1970 +0000
104 | obsolete: rewritten as 3:d004c8f274b9 by test, test2 104 | obsolete: rewritten as d004c8f274b9 by test, test2
105 | summary: A0 105 | summary: A0
106 | 106 |
107 o changeset: 0:ea207398892e 107 o changeset: 0:ea207398892e
108 user: test 108 user: test
109 date: Thu Jan 01 00:00:00 1970 +0000 109 date: Thu Jan 01 00:00:00 1970 +0000
112 112
113 $ hg fatelog -q 113 $ hg fatelog -q
114 o d004c8f274b9 114 o d004c8f274b9
115 | 115 |
116 | @ 471f378eab4c 116 | @ 471f378eab4c
117 |/ Obsfate: rewritten as 3:d004c8f274b9 117 |/ Obsfate: rewritten as d004c8f274b9
118 | 118 |
119 o ea207398892e 119 o ea207398892e
120 120
121 121
122 $ hg fatelog 122 $ hg fatelog
123 o d004c8f274b9 123 o d004c8f274b9
124 | 124 |
125 | @ 471f378eab4c 125 | @ 471f378eab4c
126 |/ Obsfate: rewritten as 3:d004c8f274b9 by test, test2 126 |/ Obsfate: rewritten as d004c8f274b9 by test, test2
127 | 127 |
128 o ea207398892e 128 o ea207398892e
129 129
130 $ hg fatelog -v 130 $ hg fatelog -v
131 o d004c8f274b9 131 o d004c8f274b9
132 | 132 |
133 | @ 471f378eab4c 133 | @ 471f378eab4c
134 |/ Obsfate: rewritten as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) 134 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
135 | 135 |
136 o ea207398892e 136 o ea207398892e
137 137
138 138
139 (check json) 139 (check json)
160 (use 'hg evolve' to update to its successor: d004c8f274b9) 160 (use 'hg evolve' to update to its successor: d004c8f274b9)
161 161
162 Precursors template should show current revision as it is the working copy 162 Precursors template should show current revision as it is the working copy
163 $ hg tlog 163 $ hg tlog
164 o d004c8f274b9 164 o d004c8f274b9
165 | Precursors: 2:a468dc9b3633 165 | Precursors: 3:a468dc9b3633
166 | semi-colon: 2:a468dc9b3633 166 | semi-colon: 3:a468dc9b3633
167 | @ a468dc9b3633 167 | @ a468dc9b3633
168 |/ Successors: 3:d004c8f274b9 168 |/ Successors: 4:d004c8f274b9
169 | semi-colon: 3:d004c8f274b9 169 | semi-colon: 4:d004c8f274b9
170 | Fate: reworded as 3:d004c8f274b9 by test2 170 | Fate: reworded as d004c8f274b9 by test2
171 | 171 |
172 o ea207398892e 172 o ea207398892e
173 173
174 Precursors template should show the precursor as we force its display with 174 Precursors template should show the precursor as we force its display with
175 --hidden 175 --hidden
176 $ hg tlog --hidden 176 $ hg tlog --hidden
177 o d004c8f274b9 177 o d004c8f274b9
178 | Precursors: 2:a468dc9b3633 178 | Precursors: 3:a468dc9b3633
179 | semi-colon: 2:a468dc9b3633 179 | semi-colon: 3:a468dc9b3633
180 | @ a468dc9b3633 180 | @ a468dc9b3633
181 |/ Precursors: 1:471f378eab4c 181 |/ Precursors: 1:471f378eab4c
182 | semi-colon: 1:471f378eab4c 182 | semi-colon: 1:471f378eab4c
183 | Successors: 3:d004c8f274b9 183 | Successors: 4:d004c8f274b9
184 | semi-colon: 3:d004c8f274b9 184 | semi-colon: 4:d004c8f274b9
185 | Fate: reworded as 3:d004c8f274b9 by test2 185 | Fate: reworded as d004c8f274b9 by test2
186 |
187 | x 471f378eab4c
188 |/ Successors: 2:a468dc9b3633
189 | semi-colon: 2:a468dc9b3633
190 | Fate: rewritten as 2:a468dc9b3633
191 |
192 o ea207398892e
193
194 $ hg fatelog -v
195 o d004c8f274b9
196 | 186 |
197 | @ a468dc9b3633 187 | @ a468dc9b3633
198 |/ Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) 188 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
199 | 189 |
200 o ea207398892e 190 o ea207398892e
201 191
202 $ hg up 'desc(A2)' 192 $ hg up 'desc(A2)'
203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 193 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
206 | 196 |
207 o ea207398892e 197 o ea207398892e
208 198
209 $ hg tlog --hidden 199 $ hg tlog --hidden
210 @ d004c8f274b9 200 @ d004c8f274b9
211 | Precursors: 2:a468dc9b3633 201 | Precursors: 3:a468dc9b3633
212 | semi-colon: 2:a468dc9b3633 202 | semi-colon: 3:a468dc9b3633
213 | x a468dc9b3633 203 | x a468dc9b3633
214 |/ Precursors: 1:471f378eab4c 204 |/ Precursors: 1:471f378eab4c
215 | semi-colon: 1:471f378eab4c 205 | semi-colon: 1:471f378eab4c
216 | Successors: 3:d004c8f274b9 206 | Successors: 4:d004c8f274b9
217 | semi-colon: 3:d004c8f274b9 207 | semi-colon: 4:d004c8f274b9
218 | Fate: reworded as 3:d004c8f274b9 by test2 208 | Fate: reworded as d004c8f274b9 by test2
219 | 209 |
220 | x 471f378eab4c 210 | x 471f378eab4c
221 |/ Successors: 2:a468dc9b3633 211 |/ Successors: 3:a468dc9b3633
222 | semi-colon: 2:a468dc9b3633 212 | semi-colon: 3:a468dc9b3633
223 | Fate: rewritten as 2:a468dc9b3633 213 | Fate: rewritten as a468dc9b3633
224 | 214 |
225 o ea207398892e 215 o ea207398892e
226 216
227 $ hg fatelog -v 217 $ hg fatelog -v
228 @ d004c8f274b9 218 @ d004c8f274b9
232 222
233 $ hg fatelog -v --hidden 223 $ hg fatelog -v --hidden
234 @ d004c8f274b9 224 @ d004c8f274b9
235 | 225 |
236 | x a468dc9b3633 226 | x a468dc9b3633
237 |/ Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) 227 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
238 | 228 |
239 | x 471f378eab4c 229 | x 471f378eab4c
240 |/ Obsfate: rewritten as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) 230 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
241 | 231 |
242 o ea207398892e 232 o ea207398892e
243 233
244 234
245 $ hg fatelogjson --hidden 235 $ hg fatelogjson --hidden
246 @ d004c8f274b9 [] 236 @ d004c8f274b9 []
247 | 237 |
248 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] 238 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
249 |/ 239 |/
250 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] 240 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
251 |/ 241 |/
252 o ea207398892e [] 242 o ea207398892e []
253 243
254 244
255 Test templates with splitted commit 245 Test templates with splitted commit
324 | summary: A0 314 | summary: A0
325 | 315 |
326 | x changeset: 1:471597cad322 316 | x changeset: 1:471597cad322
327 |/ user: test 317 |/ user: test
328 | date: Thu Jan 01 00:00:00 1970 +0000 318 | date: Thu Jan 01 00:00:00 1970 +0000
329 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a 319 | obsolete: split as 337fec4d2edc, f257fde29c7a
330 | summary: A0 320 | summary: A0
331 | 321 |
332 o changeset: 0:ea207398892e 322 o changeset: 0:ea207398892e
333 user: test 323 user: test
334 date: Thu Jan 01 00:00:00 1970 +0000 324 date: Thu Jan 01 00:00:00 1970 +0000
352 | Precursors: 1:471597cad322 342 | Precursors: 1:471597cad322
353 | semi-colon: 1:471597cad322 343 | semi-colon: 1:471597cad322
354 | @ 471597cad322 344 | @ 471597cad322
355 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a 345 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
356 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a 346 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a
357 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a 347 | Fate: split as 337fec4d2edc, f257fde29c7a
358 | 348 |
359 o ea207398892e 349 o ea207398892e
360 350
361 $ hg fatelog 351 $ hg fatelog
362 o f257fde29c7a 352 o f257fde29c7a
363 | 353 |
364 o 337fec4d2edc 354 o 337fec4d2edc
365 | 355 |
366 | @ 471597cad322 356 | @ 471597cad322
367 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a 357 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
368 | 358 |
369 o ea207398892e 359 o ea207398892e
370 360
371 361
372 $ hg up f257fde29c7a 362 $ hg up f257fde29c7a
391 | Precursors: 1:471597cad322 381 | Precursors: 1:471597cad322
392 | semi-colon: 1:471597cad322 382 | semi-colon: 1:471597cad322
393 | x 471597cad322 383 | x 471597cad322
394 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a 384 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
395 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a 385 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a
396 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a 386 | Fate: split as 337fec4d2edc, f257fde29c7a
397 | 387 |
398 o ea207398892e 388 o ea207398892e
399 389
400 $ hg fatelog --hidden 390 $ hg fatelog --hidden
401 @ f257fde29c7a 391 @ f257fde29c7a
402 | 392 |
403 o 337fec4d2edc 393 o 337fec4d2edc
404 | 394 |
405 | x 471597cad322 395 | x 471597cad322
406 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a 396 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
407 | 397 |
408 o ea207398892e 398 o ea207398892e
409 399
410 400
411 $ hg fatelogjson --hidden 401 $ hg fatelogjson --hidden
458 | summary: C0 448 | summary: C0
459 | 449 |
460 | x changeset: 2:0dec01379d3b 450 | x changeset: 2:0dec01379d3b
461 | | user: test 451 | | user: test
462 | | date: Thu Jan 01 00:00:00 1970 +0000 452 | | date: Thu Jan 01 00:00:00 1970 +0000
463 | | obsolete: rewritten as 3:eb5a0daa2192 453 | | obsolete: rewritten as eb5a0daa2192
464 | | summary: B0 454 | | summary: B0
465 | | 455 | |
466 | x changeset: 1:471f378eab4c 456 | x changeset: 1:471f378eab4c
467 |/ user: test 457 |/ user: test
468 | date: Thu Jan 01 00:00:00 1970 +0000 458 | date: Thu Jan 01 00:00:00 1970 +0000
469 | obsolete: rewritten as 3:eb5a0daa2192 459 | obsolete: rewritten as eb5a0daa2192
470 | summary: A0 460 | summary: A0
471 | 461 |
472 o changeset: 0:ea207398892e 462 o changeset: 0:ea207398892e
473 user: test 463 user: test
474 date: Thu Jan 01 00:00:00 1970 +0000 464 date: Thu Jan 01 00:00:00 1970 +0000
488 | Precursors: 1:471f378eab4c 478 | Precursors: 1:471f378eab4c
489 | semi-colon: 1:471f378eab4c 479 | semi-colon: 1:471f378eab4c
490 | @ 471f378eab4c 480 | @ 471f378eab4c
491 |/ Successors: 3:eb5a0daa2192 481 |/ Successors: 3:eb5a0daa2192
492 | semi-colon: 3:eb5a0daa2192 482 | semi-colon: 3:eb5a0daa2192
493 | Fate: rewritten as 3:eb5a0daa2192 483 | Fate: rewritten as eb5a0daa2192
494 | 484 |
495 o ea207398892e 485 o ea207398892e
496 486
497 $ hg fatelog 487 $ hg fatelog
498 o eb5a0daa2192 488 o eb5a0daa2192
499 | 489 |
500 | @ 471f378eab4c 490 | @ 471f378eab4c
501 |/ Obsfate: rewritten as 3:eb5a0daa2192 491 |/ Obsfate: rewritten as eb5a0daa2192
502 | 492 |
503 o ea207398892e 493 o ea207398892e
504 494
505 $ hg up 'desc(B0)' --hidden 495 $ hg up 'desc(B0)' --hidden
506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 496 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
514 | Precursors: 2:0dec01379d3b 1:471f378eab4c 504 | Precursors: 2:0dec01379d3b 1:471f378eab4c
515 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 505 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
516 | @ 0dec01379d3b 506 | @ 0dec01379d3b
517 | | Successors: 3:eb5a0daa2192 507 | | Successors: 3:eb5a0daa2192
518 | | semi-colon: 3:eb5a0daa2192 508 | | semi-colon: 3:eb5a0daa2192
519 | | Fate: rewritten as 3:eb5a0daa2192 509 | | Fate: rewritten as eb5a0daa2192
520 | | 510 | |
521 | x 471f378eab4c 511 | x 471f378eab4c
522 |/ Successors: 3:eb5a0daa2192 512 |/ Successors: 3:eb5a0daa2192
523 | semi-colon: 3:eb5a0daa2192 513 | semi-colon: 3:eb5a0daa2192
524 | Fate: rewritten as 3:eb5a0daa2192 514 | Fate: rewritten as eb5a0daa2192
525 | 515 |
526 o ea207398892e 516 o ea207398892e
527 517
528 $ hg fatelog 518 $ hg fatelog
529 o eb5a0daa2192 519 o eb5a0daa2192
530 | 520 |
531 | @ 0dec01379d3b 521 | @ 0dec01379d3b
532 | | Obsfate: rewritten as 3:eb5a0daa2192 522 | | Obsfate: rewritten as eb5a0daa2192
533 | | 523 | |
534 | x 471f378eab4c 524 | x 471f378eab4c
535 |/ Obsfate: rewritten as 3:eb5a0daa2192 525 |/ Obsfate: rewritten as eb5a0daa2192
536 | 526 |
537 o ea207398892e 527 o ea207398892e
538 528
539 529
540 $ hg up 'desc(C0)' 530 $ hg up 'desc(C0)'
554 | Precursors: 2:0dec01379d3b 1:471f378eab4c 544 | Precursors: 2:0dec01379d3b 1:471f378eab4c
555 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 545 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
556 | x 0dec01379d3b 546 | x 0dec01379d3b
557 | | Successors: 3:eb5a0daa2192 547 | | Successors: 3:eb5a0daa2192
558 | | semi-colon: 3:eb5a0daa2192 548 | | semi-colon: 3:eb5a0daa2192
559 | | Fate: rewritten as 3:eb5a0daa2192 549 | | Fate: rewritten as eb5a0daa2192
560 | | 550 | |
561 | x 471f378eab4c 551 | x 471f378eab4c
562 |/ Successors: 3:eb5a0daa2192 552 |/ Successors: 3:eb5a0daa2192
563 | semi-colon: 3:eb5a0daa2192 553 | semi-colon: 3:eb5a0daa2192
564 | Fate: rewritten as 3:eb5a0daa2192 554 | Fate: rewritten as eb5a0daa2192
565 | 555 |
566 o ea207398892e 556 o ea207398892e
567 557
568 $ hg fatelog --hidden 558 $ hg fatelog --hidden
569 @ eb5a0daa2192 559 @ eb5a0daa2192
570 | 560 |
571 | x 0dec01379d3b 561 | x 0dec01379d3b
572 | | Obsfate: rewritten as 3:eb5a0daa2192 562 | | Obsfate: rewritten as eb5a0daa2192
573 | | 563 | |
574 | x 471f378eab4c 564 | x 471f378eab4c
575 |/ Obsfate: rewritten as 3:eb5a0daa2192 565 |/ Obsfate: rewritten as eb5a0daa2192
576 | 566 |
577 o ea207398892e 567 o ea207398892e
578 568
579 569
580 $ hg fatelogjson --hidden 570 $ hg fatelogjson --hidden
607 | summary: A1 597 | summary: A1
608 | 598 |
609 | x changeset: 1:471f378eab4c 599 | x changeset: 1:471f378eab4c
610 |/ user: test 600 |/ user: test
611 | date: Thu Jan 01 00:00:00 1970 +0000 601 | date: Thu Jan 01 00:00:00 1970 +0000
612 | obsolete: reworded as 2:fdf9bde5129a 602 | obsolete: reworded as fdf9bde5129a
613 | summary: A0 603 | summary: A0
614 | 604 |
615 o changeset: 0:ea207398892e 605 o changeset: 0:ea207398892e
616 user: test 606 user: test
617 date: Thu Jan 01 00:00:00 1970 +0000 607 date: Thu Jan 01 00:00:00 1970 +0000
640 | summary: A1 630 | summary: A1
641 | 631 |
642 | x changeset: 1:471f378eab4c 632 | x changeset: 1:471f378eab4c
643 |/ user: test 633 |/ user: test
644 | date: Thu Jan 01 00:00:00 1970 +0000 634 | date: Thu Jan 01 00:00:00 1970 +0000
645 | obsolete: reworded as 2:fdf9bde5129a 635 | obsolete: reworded as fdf9bde5129a
646 | obsolete: reworded as 3:65b757b745b9 636 | obsolete: reworded as 65b757b745b9
647 | summary: A0 637 | summary: A0
648 | 638 |
649 o changeset: 0:ea207398892e 639 o changeset: 0:ea207398892e
650 user: test 640 user: test
651 date: Thu Jan 01 00:00:00 1970 +0000 641 date: Thu Jan 01 00:00:00 1970 +0000
670 |/ Precursors: 1:471f378eab4c 660 |/ Precursors: 1:471f378eab4c
671 | semi-colon: 1:471f378eab4c 661 | semi-colon: 1:471f378eab4c
672 | @ 471f378eab4c 662 | @ 471f378eab4c
673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 663 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 664 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383
675 | Fate: reworded as 2:fdf9bde5129a 665 | Fate: reworded as fdf9bde5129a
676 | Fate: reworded as 4:019fadeab383 666 | Fate: reworded as 019fadeab383
677 | 667 |
678 o ea207398892e 668 o ea207398892e
679 669
680 $ hg fatelog 670 $ hg fatelog
681 o 019fadeab383 671 o 019fadeab383
682 | 672 |
683 | o fdf9bde5129a 673 | o fdf9bde5129a
684 |/ 674 |/
685 | @ 471f378eab4c 675 | @ 471f378eab4c
686 |/ Obsfate: reworded as 2:fdf9bde5129a; reworded as 4:019fadeab383 676 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
687 | 677 |
688 o ea207398892e 678 o ea207398892e
689 679
690 680
691 $ hg up 'desc(A1)' 681 $ hg up 'desc(A1)'
715 | x 65b757b745b9 705 | x 65b757b745b9
716 |/ Precursors: 1:471f378eab4c 706 |/ Precursors: 1:471f378eab4c
717 | semi-colon: 1:471f378eab4c 707 | semi-colon: 1:471f378eab4c
718 | Successors: 4:019fadeab383 708 | Successors: 4:019fadeab383
719 | semi-colon: 4:019fadeab383 709 | semi-colon: 4:019fadeab383
720 | Fate: reworded as 4:019fadeab383 710 | Fate: reworded as 019fadeab383
721 | 711 |
722 | @ fdf9bde5129a 712 | @ fdf9bde5129a
723 |/ Precursors: 1:471f378eab4c 713 |/ Precursors: 1:471f378eab4c
724 | semi-colon: 1:471f378eab4c 714 | semi-colon: 1:471f378eab4c
725 | x 471f378eab4c 715 | x 471f378eab4c
726 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 716 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
727 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 717 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
728 | Fate: reworded as 2:fdf9bde5129a 718 | Fate: reworded as fdf9bde5129a
729 | Fate: reworded as 3:65b757b745b9 719 | Fate: reworded as 65b757b745b9
730 | 720 |
731 o ea207398892e 721 o ea207398892e
732 722
733 $ hg fatelog --hidden 723 $ hg fatelog --hidden
734 o 019fadeab383 724 o 019fadeab383
735 | 725 |
736 | x 65b757b745b9 726 | x 65b757b745b9
737 |/ Obsfate: reworded as 4:019fadeab383 727 |/ Obsfate: reworded as 019fadeab383
738 | 728 |
739 | @ fdf9bde5129a 729 | @ fdf9bde5129a
740 |/ 730 |/
741 | x 471f378eab4c 731 | x 471f378eab4c
742 |/ Obsfate: reworded as 2:fdf9bde5129a; reworded as 3:65b757b745b9 732 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
743 | 733 |
744 o ea207398892e 734 o ea207398892e
745 735
746 736
747 $ hg fatelogjson --hidden 737 $ hg fatelogjson --hidden
777 | summary: B1 767 | summary: B1
778 | 768 |
779 | x changeset: 2:0dec01379d3b 769 | x changeset: 2:0dec01379d3b
780 |/ user: test 770 |/ user: test
781 | date: Thu Jan 01 00:00:00 1970 +0000 771 | date: Thu Jan 01 00:00:00 1970 +0000
782 | obsolete: reworded as 3:b7ea6d14e664 772 | obsolete: reworded as b7ea6d14e664
783 | summary: B0 773 | summary: B0
784 | 774 |
785 o changeset: 1:471f378eab4c 775 o changeset: 1:471f378eab4c
786 | user: test 776 | user: test
787 | date: Thu Jan 01 00:00:00 1970 +0000 777 | date: Thu Jan 01 00:00:00 1970 +0000
805 | 795 |
806 | x changeset: 3:b7ea6d14e664 796 | x changeset: 3:b7ea6d14e664
807 | | parent: 1:471f378eab4c 797 | | parent: 1:471f378eab4c
808 | | user: test 798 | | user: test
809 | | date: Thu Jan 01 00:00:00 1970 +0000 799 | | date: Thu Jan 01 00:00:00 1970 +0000
810 | | obsolete: rewritten as 4:eb5a0daa2192 800 | | obsolete: rewritten as eb5a0daa2192
811 | | summary: B1 801 | | summary: B1
812 | | 802 | |
813 | | x changeset: 2:0dec01379d3b 803 | | x changeset: 2:0dec01379d3b
814 | |/ user: test 804 | |/ user: test
815 | | date: Thu Jan 01 00:00:00 1970 +0000 805 | | date: Thu Jan 01 00:00:00 1970 +0000
816 | | obsolete: reworded as 3:b7ea6d14e664 806 | | obsolete: reworded as b7ea6d14e664
817 | | summary: B0 807 | | summary: B0
818 | | 808 | |
819 | x changeset: 1:471f378eab4c 809 | x changeset: 1:471f378eab4c
820 |/ user: test 810 |/ user: test
821 | date: Thu Jan 01 00:00:00 1970 +0000 811 | date: Thu Jan 01 00:00:00 1970 +0000
822 | obsolete: rewritten as 4:eb5a0daa2192 812 | obsolete: rewritten as eb5a0daa2192
823 | summary: A0 813 | summary: A0
824 | 814 |
825 o changeset: 0:ea207398892e 815 o changeset: 0:ea207398892e
826 user: test 816 user: test
827 date: Thu Jan 01 00:00:00 1970 +0000 817 date: Thu Jan 01 00:00:00 1970 +0000
839 | Precursors: 1:471f378eab4c 829 | Precursors: 1:471f378eab4c
840 | semi-colon: 1:471f378eab4c 830 | semi-colon: 1:471f378eab4c
841 | @ 471f378eab4c 831 | @ 471f378eab4c
842 |/ Successors: 4:eb5a0daa2192 832 |/ Successors: 4:eb5a0daa2192
843 | semi-colon: 4:eb5a0daa2192 833 | semi-colon: 4:eb5a0daa2192
844 | Fate: rewritten as 4:eb5a0daa2192 834 | Fate: rewritten as eb5a0daa2192
845 | 835 |
846 o ea207398892e 836 o ea207398892e
847 837
848 $ hg fatelog 838 $ hg fatelog
849 o eb5a0daa2192 839 o eb5a0daa2192
850 | 840 |
851 | @ 471f378eab4c 841 | @ 471f378eab4c
852 |/ Obsfate: rewritten as 4:eb5a0daa2192 842 |/ Obsfate: rewritten as eb5a0daa2192
853 | 843 |
854 o ea207398892e 844 o ea207398892e
855 845
856 $ hg up 'desc(B0)' --hidden 846 $ hg up 'desc(B0)' --hidden
857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 847 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
862 | Precursors: 2:0dec01379d3b 1:471f378eab4c 852 | Precursors: 2:0dec01379d3b 1:471f378eab4c
863 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c 853 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
864 | @ 0dec01379d3b 854 | @ 0dec01379d3b
865 | | Successors: 4:eb5a0daa2192 855 | | Successors: 4:eb5a0daa2192
866 | | semi-colon: 4:eb5a0daa2192 856 | | semi-colon: 4:eb5a0daa2192
867 | | Fate: rewritten as 4:eb5a0daa2192 857 | | Fate: rewritten as eb5a0daa2192
868 | | 858 | |
869 | x 471f378eab4c 859 | x 471f378eab4c
870 |/ Successors: 4:eb5a0daa2192 860 |/ Successors: 4:eb5a0daa2192
871 | semi-colon: 4:eb5a0daa2192 861 | semi-colon: 4:eb5a0daa2192
872 | Fate: rewritten as 4:eb5a0daa2192 862 | Fate: rewritten as eb5a0daa2192
873 | 863 |
874 o ea207398892e 864 o ea207398892e
875 865
876 $ hg fatelog 866 $ hg fatelog
877 o eb5a0daa2192 867 o eb5a0daa2192
878 | 868 |
879 | @ 0dec01379d3b 869 | @ 0dec01379d3b
880 | | Obsfate: rewritten as 4:eb5a0daa2192 870 | | Obsfate: rewritten as eb5a0daa2192
881 | | 871 | |
882 | x 471f378eab4c 872 | x 471f378eab4c
883 |/ Obsfate: rewritten as 4:eb5a0daa2192 873 |/ Obsfate: rewritten as eb5a0daa2192
884 | 874 |
885 o ea207398892e 875 o ea207398892e
886 876
887 877
888 $ hg up 'desc(B1)' --hidden 878 $ hg up 'desc(B1)' --hidden
894 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 884 | Precursors: 1:471f378eab4c 3:b7ea6d14e664
895 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 885 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
896 | @ b7ea6d14e664 886 | @ b7ea6d14e664
897 | | Successors: 4:eb5a0daa2192 887 | | Successors: 4:eb5a0daa2192
898 | | semi-colon: 4:eb5a0daa2192 888 | | semi-colon: 4:eb5a0daa2192
899 | | Fate: rewritten as 4:eb5a0daa2192 889 | | Fate: rewritten as eb5a0daa2192
900 | | 890 | |
901 | x 471f378eab4c 891 | x 471f378eab4c
902 |/ Successors: 4:eb5a0daa2192 892 |/ Successors: 4:eb5a0daa2192
903 | semi-colon: 4:eb5a0daa2192 893 | semi-colon: 4:eb5a0daa2192
904 | Fate: rewritten as 4:eb5a0daa2192 894 | Fate: rewritten as eb5a0daa2192
905 | 895 |
906 o ea207398892e 896 o ea207398892e
907 897
908 $ hg fatelog 898 $ hg fatelog
909 o eb5a0daa2192 899 o eb5a0daa2192
910 | 900 |
911 | @ b7ea6d14e664 901 | @ b7ea6d14e664
912 | | Obsfate: rewritten as 4:eb5a0daa2192 902 | | Obsfate: rewritten as eb5a0daa2192
913 | | 903 | |
914 | x 471f378eab4c 904 | x 471f378eab4c
915 |/ Obsfate: rewritten as 4:eb5a0daa2192 905 |/ Obsfate: rewritten as eb5a0daa2192
916 | 906 |
917 o ea207398892e 907 o ea207398892e
918 908
919 909
920 $ hg up 'desc(C0)' 910 $ hg up 'desc(C0)'
931 | x b7ea6d14e664 921 | x b7ea6d14e664
932 | | Precursors: 2:0dec01379d3b 922 | | Precursors: 2:0dec01379d3b
933 | | semi-colon: 2:0dec01379d3b 923 | | semi-colon: 2:0dec01379d3b
934 | | Successors: 4:eb5a0daa2192 924 | | Successors: 4:eb5a0daa2192
935 | | semi-colon: 4:eb5a0daa2192 925 | | semi-colon: 4:eb5a0daa2192
936 | | Fate: rewritten as 4:eb5a0daa2192 926 | | Fate: rewritten as eb5a0daa2192
937 | | 927 | |
938 | | x 0dec01379d3b 928 | | x 0dec01379d3b
939 | |/ Successors: 3:b7ea6d14e664 929 | |/ Successors: 3:b7ea6d14e664
940 | | semi-colon: 3:b7ea6d14e664 930 | | semi-colon: 3:b7ea6d14e664
941 | | Fate: reworded as 3:b7ea6d14e664 931 | | Fate: reworded as b7ea6d14e664
942 | | 932 | |
943 | x 471f378eab4c 933 | x 471f378eab4c
944 |/ Successors: 4:eb5a0daa2192 934 |/ Successors: 4:eb5a0daa2192
945 | semi-colon: 4:eb5a0daa2192 935 | semi-colon: 4:eb5a0daa2192
946 | Fate: rewritten as 4:eb5a0daa2192 936 | Fate: rewritten as eb5a0daa2192
947 | 937 |
948 o ea207398892e 938 o ea207398892e
949 939
950 $ hg fatelog --hidden 940 $ hg fatelog --hidden
951 @ eb5a0daa2192 941 @ eb5a0daa2192
952 | 942 |
953 | x b7ea6d14e664 943 | x b7ea6d14e664
954 | | Obsfate: rewritten as 4:eb5a0daa2192 944 | | Obsfate: rewritten as eb5a0daa2192
955 | | 945 | |
956 | | x 0dec01379d3b 946 | | x 0dec01379d3b
957 | |/ Obsfate: reworded as 3:b7ea6d14e664 947 | |/ Obsfate: reworded as b7ea6d14e664
958 | | 948 | |
959 | x 471f378eab4c 949 | x 471f378eab4c
960 |/ Obsfate: rewritten as 4:eb5a0daa2192 950 |/ Obsfate: rewritten as eb5a0daa2192
961 | 951 |
962 o ea207398892e 952 o ea207398892e
963 953
964 $ hg fatelogjson --hidden 954 $ hg fatelogjson --hidden
965 @ eb5a0daa2192 [] 955 @ eb5a0daa2192 []
1012 | 1002 |
1013 | x changeset: 2:fdf9bde5129a 1003 | x changeset: 2:fdf9bde5129a
1014 |/ parent: 0:ea207398892e 1004 |/ parent: 0:ea207398892e
1015 | user: test 1005 | user: test
1016 | date: Thu Jan 01 00:00:00 1970 +0000 1006 | date: Thu Jan 01 00:00:00 1970 +0000
1017 | obsolete: reworded as 3:7a230b46bf61 1007 | obsolete: reworded as 7a230b46bf61
1018 | summary: A1 1008 | summary: A1
1019 | 1009 |
1020 | x changeset: 1:471f378eab4c 1010 | x changeset: 1:471f378eab4c
1021 |/ user: test 1011 |/ user: test
1022 | date: Thu Jan 01 00:00:00 1970 +0000 1012 | date: Thu Jan 01 00:00:00 1970 +0000
1023 | obsolete: reworded as 2:fdf9bde5129a 1013 | obsolete: reworded as fdf9bde5129a
1024 | summary: A0 1014 | summary: A0
1025 | 1015 |
1026 o changeset: 0:ea207398892e 1016 o changeset: 0:ea207398892e
1027 user: test 1017 user: test
1028 date: Thu Jan 01 00:00:00 1970 +0000 1018 date: Thu Jan 01 00:00:00 1970 +0000
1036 adding manifests 1026 adding manifests
1037 adding file changes 1027 adding file changes
1038 added 1 changesets with 0 changes to 1 files (+1 heads) 1028 added 1 changesets with 0 changes to 1 files (+1 heads)
1039 2 new obsolescence markers 1029 2 new obsolescence markers
1040 obsoleted 1 changesets 1030 obsoleted 1 changesets
1041 new changesets 7a230b46bf61
1042 (run 'hg heads' to see heads, 'hg merge' to merge) 1031 (run 'hg heads' to see heads, 'hg merge' to merge)
1043 working directory parent is obsolete! (471f378eab4c) 1032 working directory parent is obsolete! (471f378eab4c)
1044 (use 'hg evolve' to update to its successor: 7a230b46bf61) 1033 (use 'hg evolve' to update to its successor: 7a230b46bf61)
1045 $ hg log --hidden -G 1034 $ hg log --hidden -G
1046 o changeset: 2:7a230b46bf61 1035 o changeset: 2:7a230b46bf61
1051 | summary: A2 1040 | summary: A2
1052 | 1041 |
1053 | @ changeset: 1:471f378eab4c 1042 | @ changeset: 1:471f378eab4c
1054 |/ user: test 1043 |/ user: test
1055 | date: Thu Jan 01 00:00:00 1970 +0000 1044 | date: Thu Jan 01 00:00:00 1970 +0000
1056 | obsolete: reworded as 2:7a230b46bf61 1045 | obsolete: reworded as 7a230b46bf61
1057 | summary: A0 1046 | summary: A0
1058 | 1047 |
1059 o changeset: 0:ea207398892e 1048 o changeset: 0:ea207398892e
1060 user: test 1049 user: test
1061 date: Thu Jan 01 00:00:00 1970 +0000 1050 date: Thu Jan 01 00:00:00 1970 +0000
1069 | Precursors: 1:471f378eab4c 1058 | Precursors: 1:471f378eab4c
1070 | semi-colon: 1:471f378eab4c 1059 | semi-colon: 1:471f378eab4c
1071 | @ 471f378eab4c 1060 | @ 471f378eab4c
1072 |/ Successors: 2:7a230b46bf61 1061 |/ Successors: 2:7a230b46bf61
1073 | semi-colon: 2:7a230b46bf61 1062 | semi-colon: 2:7a230b46bf61
1074 | Fate: reworded as 2:7a230b46bf61 1063 | Fate: reworded as 7a230b46bf61
1075 | 1064 |
1076 o ea207398892e 1065 o ea207398892e
1077 1066
1078 $ hg fatelog --hidden -v 1067 $ hg fatelog --hidden -v
1079 o 7a230b46bf61 1068 o 7a230b46bf61
1080 | 1069 |
1081 | @ 471f378eab4c 1070 | @ 471f378eab4c
1082 |/ Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) 1071 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
1083 | 1072 |
1084 o ea207398892e 1073 o ea207398892e
1085 1074
1086 $ hg up 'desc(A2)' 1075 $ hg up 'desc(A2)'
1087 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1076 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1100 | Precursors: 1:471f378eab4c 1089 | Precursors: 1:471f378eab4c
1101 | semi-colon: 1:471f378eab4c 1090 | semi-colon: 1:471f378eab4c
1102 | x 471f378eab4c 1091 | x 471f378eab4c
1103 |/ Successors: 2:7a230b46bf61 1092 |/ Successors: 2:7a230b46bf61
1104 | semi-colon: 2:7a230b46bf61 1093 | semi-colon: 2:7a230b46bf61
1105 | Fate: reworded as 2:7a230b46bf61 1094 | Fate: reworded as 7a230b46bf61
1106 | 1095 |
1107 o ea207398892e 1096 o ea207398892e
1108 1097
1109 $ hg fatelog --hidden -v 1098 $ hg fatelog --hidden -v
1110 @ 7a230b46bf61 1099 @ 7a230b46bf61
1111 | 1100 |
1112 | x 471f378eab4c 1101 | x 471f378eab4c
1113 |/ Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) 1102 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
1114 | 1103 |
1115 o ea207398892e 1104 o ea207398892e
1116 1105
1117 1106
1118 $ hg fatelogjson --hidden 1107 $ hg fatelogjson --hidden