Mercurial > hg
comparison tests/test-obsmarker-template.t @ 32911:7f1d07d2c8f8
templatekw: use common "rev:node" format as the default of predecessors
I'm not sure if this is better. If we're planning to add a template keyword
that returns obsoleted nodes unavailable in the repo (i.e. they have no valid
revision numbers), we might want to use the current "node"-only format
everywhere.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 17 Jun 2017 13:34:18 +0900 |
parents | 498e9dcc5fa9 |
children | 53b3a1968aa6 |
comparison
equal
deleted
inserted
replaced
32910:498e9dcc5fa9 | 32911:7f1d07d2c8f8 |
---|---|
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 | 69 |
70 Predecessors template should show current revision as it is the working copy | 70 Predecessors template should show current revision as it is the working copy |
71 $ hg tlog | 71 $ hg tlog |
72 o d004c8f274b9 | 72 o d004c8f274b9 |
73 | Predecessors: 471f378eab4c | 73 | Predecessors: 1:471f378eab4c |
74 | semi-colon: 471f378eab4c | 74 | semi-colon: 1:471f378eab4c |
75 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 75 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
76 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 76 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
77 | @ 471f378eab4c | 77 | @ 471f378eab4c |
78 |/ | 78 |/ |
79 o ea207398892e | 79 o ea207398892e |
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 | 83 |
84 Predecessors template should show current revision as it is the working copy | 84 Predecessors template should show current revision as it is the working copy |
85 $ hg tlog | 85 $ hg tlog |
86 o d004c8f274b9 | 86 o d004c8f274b9 |
87 | Predecessors: a468dc9b3633 | 87 | Predecessors: 3:a468dc9b3633 |
88 | semi-colon: a468dc9b3633 | 88 | semi-colon: 3:a468dc9b3633 |
89 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | 89 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
90 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | 90 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
91 | @ a468dc9b3633 | 91 | @ a468dc9b3633 |
92 |/ | 92 |/ |
93 o ea207398892e | 93 o ea207398892e |
94 | 94 |
95 Predecessors template should show all the predecessors as we force their display | 95 Predecessors template should show all the predecessors as we force their display |
96 with --hidden | 96 with --hidden |
97 $ hg tlog --hidden | 97 $ hg tlog --hidden |
98 o d004c8f274b9 | 98 o d004c8f274b9 |
99 | Predecessors: a468dc9b3633 | 99 | Predecessors: 3:a468dc9b3633 |
100 | semi-colon: a468dc9b3633 | 100 | semi-colon: 3:a468dc9b3633 |
101 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | 101 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
102 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | 102 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
103 | @ a468dc9b3633 | 103 | @ a468dc9b3633 |
104 |/ Predecessors: 471f378eab4c | 104 |/ Predecessors: 1:471f378eab4c |
105 | semi-colon: 471f378eab4c | 105 | semi-colon: 1:471f378eab4c |
106 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 106 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
107 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 107 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
108 | x f137d23bb3e1 | 108 | x f137d23bb3e1 |
109 | | | 109 | | |
110 | x 471f378eab4c | 110 | x 471f378eab4c |
121 | | 121 | |
122 o ea207398892e | 122 o ea207398892e |
123 | 123 |
124 $ hg tlog --hidden | 124 $ hg tlog --hidden |
125 @ d004c8f274b9 | 125 @ d004c8f274b9 |
126 | Predecessors: a468dc9b3633 | 126 | Predecessors: 3:a468dc9b3633 |
127 | semi-colon: a468dc9b3633 | 127 | semi-colon: 3:a468dc9b3633 |
128 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | 128 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
129 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | 129 | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
130 | x a468dc9b3633 | 130 | x a468dc9b3633 |
131 |/ Predecessors: 471f378eab4c | 131 |/ Predecessors: 1:471f378eab4c |
132 | semi-colon: 471f378eab4c | 132 | semi-colon: 1:471f378eab4c |
133 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 133 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
134 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 134 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
135 | x f137d23bb3e1 | 135 | x f137d23bb3e1 |
136 | | | 136 | | |
137 | x 471f378eab4c | 137 | x 471f378eab4c |
204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
205 | 205 |
206 Predecessors template should show current revision as it is the working copy | 206 Predecessors template should show current revision as it is the working copy |
207 $ hg tlog | 207 $ hg tlog |
208 o f257fde29c7a | 208 o f257fde29c7a |
209 | Predecessors: 471597cad322 | 209 | Predecessors: 1:471597cad322 |
210 | semi-colon: 471597cad322 | 210 | semi-colon: 1:471597cad322 |
211 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | 211 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
212 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | 212 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
213 o 337fec4d2edc | 213 o 337fec4d2edc |
214 | Predecessors: 471597cad322 | 214 | Predecessors: 1:471597cad322 |
215 | semi-colon: 471597cad322 | 215 | semi-colon: 1:471597cad322 |
216 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | 216 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
217 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | 217 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
218 | @ 471597cad322 | 218 | @ 471597cad322 |
219 |/ | 219 |/ |
220 o ea207398892e | 220 o ea207398892e |
233 | 233 |
234 Predecessors template should show both predecessors as we force their display | 234 Predecessors template should show both predecessors as we force their display |
235 with --hidden | 235 with --hidden |
236 $ hg tlog --hidden | 236 $ hg tlog --hidden |
237 @ f257fde29c7a | 237 @ f257fde29c7a |
238 | Predecessors: 471597cad322 | 238 | Predecessors: 1:471597cad322 |
239 | semi-colon: 471597cad322 | 239 | semi-colon: 1:471597cad322 |
240 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | 240 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
241 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | 241 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
242 o 337fec4d2edc | 242 o 337fec4d2edc |
243 | Predecessors: 471597cad322 | 243 | Predecessors: 1:471597cad322 |
244 | semi-colon: 471597cad322 | 244 | semi-colon: 1:471597cad322 |
245 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | 245 | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
246 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | 246 | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
247 | x 471597cad322 | 247 | x 471597cad322 |
248 |/ | 248 |/ |
249 o ea207398892e | 249 o ea207398892e |
318 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 318 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
319 | 319 |
320 Predecessors template should show current revision as it is the working copy | 320 Predecessors template should show current revision as it is the working copy |
321 $ hg tlog | 321 $ hg tlog |
322 o eb5a0daa2192 | 322 o eb5a0daa2192 |
323 | Predecessors: 471f378eab4c | 323 | Predecessors: 1:471f378eab4c |
324 | semi-colon: 471f378eab4c | 324 | semi-colon: 1:471f378eab4c |
325 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 325 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
326 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 326 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
327 | @ 471f378eab4c | 327 | @ 471f378eab4c |
328 |/ | 328 |/ |
329 o ea207398892e | 329 o ea207398892e |
333 | 333 |
334 Predecessors template should show both predecessors as they should be both | 334 Predecessors template should show both predecessors as they should be both |
335 displayed | 335 displayed |
336 $ hg tlog | 336 $ hg tlog |
337 o eb5a0daa2192 | 337 o eb5a0daa2192 |
338 | Predecessors: 0dec01379d3b 471f378eab4c | 338 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
339 | semi-colon: 0dec01379d3b; 471f378eab4c | 339 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
340 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | 340 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
341 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 341 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
342 | @ 0dec01379d3b | 342 | @ 0dec01379d3b |
343 | | | 343 | | |
344 | x 471f378eab4c | 344 | x 471f378eab4c |
357 | 357 |
358 Predecessors template should show both predecessors as we force their display | 358 Predecessors template should show both predecessors as we force their display |
359 with --hidden | 359 with --hidden |
360 $ hg tlog --hidden | 360 $ hg tlog --hidden |
361 @ eb5a0daa2192 | 361 @ eb5a0daa2192 |
362 | Predecessors: 0dec01379d3b 471f378eab4c | 362 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
363 | semi-colon: 0dec01379d3b; 471f378eab4c | 363 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
364 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | 364 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
365 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 365 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
366 | x 0dec01379d3b | 366 | x 0dec01379d3b |
367 | | | 367 | | |
368 | x 471f378eab4c | 368 | x 471f378eab4c |
469 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 469 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470 | 470 |
471 Predecessors template should show current revision as it is the working copy | 471 Predecessors template should show current revision as it is the working copy |
472 $ hg tlog | 472 $ hg tlog |
473 o 019fadeab383 | 473 o 019fadeab383 |
474 | Predecessors: 471f378eab4c | 474 | Predecessors: 1:471f378eab4c |
475 | semi-colon: 471f378eab4c | 475 | semi-colon: 1:471f378eab4c |
476 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 476 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
477 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 477 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
478 | o fdf9bde5129a | 478 | o fdf9bde5129a |
479 |/ Predecessors: 471f378eab4c | 479 |/ Predecessors: 1:471f378eab4c |
480 | semi-colon: 471f378eab4c | 480 | semi-colon: 1:471f378eab4c |
481 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 481 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
482 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 482 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
483 | @ 471f378eab4c | 483 | @ 471f378eab4c |
484 |/ | 484 |/ |
485 o ea207398892e | 485 o ea207398892e |
498 | 498 |
499 Predecessors template should the predecessors as we force their display with | 499 Predecessors template should the predecessors as we force their display with |
500 --hidden | 500 --hidden |
501 $ hg tlog --hidden | 501 $ hg tlog --hidden |
502 o 019fadeab383 | 502 o 019fadeab383 |
503 | Predecessors: 65b757b745b9 | 503 | Predecessors: 3:65b757b745b9 |
504 | semi-colon: 65b757b745b9 | 504 | semi-colon: 3:65b757b745b9 |
505 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] | 505 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
506 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd | 506 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
507 | x 65b757b745b9 | 507 | x 65b757b745b9 |
508 |/ Predecessors: 471f378eab4c | 508 |/ Predecessors: 1:471f378eab4c |
509 | semi-colon: 471f378eab4c | 509 | semi-colon: 1:471f378eab4c |
510 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 510 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
511 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 511 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
512 | @ fdf9bde5129a | 512 | @ fdf9bde5129a |
513 |/ Predecessors: 471f378eab4c | 513 |/ Predecessors: 1:471f378eab4c |
514 | semi-colon: 471f378eab4c | 514 | semi-colon: 1:471f378eab4c |
515 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 515 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
516 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 516 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
517 | x 471f378eab4c | 517 | x 471f378eab4c |
518 |/ | 518 |/ |
519 o ea207398892e | 519 o ea207398892e |
602 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 602 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
603 | 603 |
604 Predecessors template should show current revision as it is the working copy | 604 Predecessors template should show current revision as it is the working copy |
605 $ hg tlog | 605 $ hg tlog |
606 o eb5a0daa2192 | 606 o eb5a0daa2192 |
607 | Predecessors: 471f378eab4c | 607 | Predecessors: 1:471f378eab4c |
608 | semi-colon: 471f378eab4c | 608 | semi-colon: 1:471f378eab4c |
609 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 609 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
610 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 610 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
611 | @ 471f378eab4c | 611 | @ 471f378eab4c |
612 |/ | 612 |/ |
613 o ea207398892e | 613 o ea207398892e |
616 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 616 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
617 | 617 |
618 Predecessors template should both predecessors as they are visible | 618 Predecessors template should both predecessors as they are visible |
619 $ hg tlog | 619 $ hg tlog |
620 o eb5a0daa2192 | 620 o eb5a0daa2192 |
621 | Predecessors: 0dec01379d3b 471f378eab4c | 621 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
622 | semi-colon: 0dec01379d3b; 471f378eab4c | 622 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
623 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | 623 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
624 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 624 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
625 | @ 0dec01379d3b | 625 | @ 0dec01379d3b |
626 | | | 626 | | |
627 | x 471f378eab4c | 627 | x 471f378eab4c |
632 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 632 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
633 | 633 |
634 Predecessors template should both predecessors as they are visible | 634 Predecessors template should both predecessors as they are visible |
635 $ hg tlog | 635 $ hg tlog |
636 o eb5a0daa2192 | 636 o eb5a0daa2192 |
637 | Predecessors: 471f378eab4c b7ea6d14e664 | 637 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
638 | semi-colon: 471f378eab4c; b7ea6d14e664 | 638 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
639 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | 639 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
640 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | 640 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
641 | @ b7ea6d14e664 | 641 | @ b7ea6d14e664 |
642 | | | 642 | | |
643 | x 471f378eab4c | 643 | x 471f378eab4c |
655 | 655 |
656 Predecessors template should show all predecessors as we force their display | 656 Predecessors template should show all predecessors as we force their display |
657 with --hidden | 657 with --hidden |
658 $ hg tlog --hidden | 658 $ hg tlog --hidden |
659 @ eb5a0daa2192 | 659 @ eb5a0daa2192 |
660 | Predecessors: 471f378eab4c b7ea6d14e664 | 660 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
661 | semi-colon: 471f378eab4c; b7ea6d14e664 | 661 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
662 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | 662 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
663 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | 663 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
664 | x b7ea6d14e664 | 664 | x b7ea6d14e664 |
665 | | Predecessors: 0dec01379d3b | 665 | | Predecessors: 2:0dec01379d3b |
666 | | semi-colon: 0dec01379d3b | 666 | | semi-colon: 2:0dec01379d3b |
667 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | 667 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
668 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | 668 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
669 | | x 0dec01379d3b | 669 | | x 0dec01379d3b |
670 | |/ | 670 | |/ |
671 | x 471f378eab4c | 671 | x 471f378eab4c |
763 --------------- | 763 --------------- |
764 | 764 |
765 Predecessors template should show current revision as it is the working copy | 765 Predecessors template should show current revision as it is the working copy |
766 $ hg tlog | 766 $ hg tlog |
767 o 7a230b46bf61 | 767 o 7a230b46bf61 |
768 | Predecessors: 471f378eab4c | 768 | Predecessors: 1:471f378eab4c |
769 | semi-colon: 471f378eab4c | 769 | semi-colon: 1:471f378eab4c |
770 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 770 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
771 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 771 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
772 | @ 471f378eab4c | 772 | @ 471f378eab4c |
773 |/ | 773 |/ |
774 o ea207398892e | 774 o ea207398892e |
784 | 784 |
785 Predecessors template should show all predecessors as we force their display | 785 Predecessors template should show all predecessors as we force their display |
786 with --hidden | 786 with --hidden |
787 $ hg tlog --hidden | 787 $ hg tlog --hidden |
788 @ 7a230b46bf61 | 788 @ 7a230b46bf61 |
789 | Predecessors: 471f378eab4c | 789 | Predecessors: 1:471f378eab4c |
790 | semi-colon: 471f378eab4c | 790 | semi-colon: 1:471f378eab4c |
791 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 791 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
792 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 792 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
793 | x 471f378eab4c | 793 | x 471f378eab4c |
794 |/ | 794 |/ |
795 o ea207398892e | 795 o ea207398892e |
828 | 828 |
829 $ hg up -r "desc(B0)" --hidden | 829 $ hg up -r "desc(B0)" --hidden |
830 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 830 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
831 $ hg tlog | 831 $ hg tlog |
832 o f897c6137566 | 832 o f897c6137566 |
833 | Predecessors: 0dec01379d3b | 833 | Predecessors: 2:0dec01379d3b |
834 | semi-colon: 0dec01379d3b | 834 | semi-colon: 2:0dec01379d3b |
835 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | 835 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
836 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | 836 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
837 | @ 0dec01379d3b | 837 | @ 0dec01379d3b |
838 | | Predecessors: 471f378eab4c | 838 | | Predecessors: 1:471f378eab4c |
839 | | semi-colon: 471f378eab4c | 839 | | semi-colon: 1:471f378eab4c |
840 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 840 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
841 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 841 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
842 | x 471f378eab4c | 842 | x 471f378eab4c |
843 |/ Predecessors: 0dec01379d3b | 843 |/ Predecessors: 2:0dec01379d3b |
844 | semi-colon: 0dec01379d3b | 844 | semi-colon: 2:0dec01379d3b |
845 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | 845 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
846 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | 846 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
847 o ea207398892e | 847 o ea207398892e |
848 | 848 |
849 | 849 |
850 $ hg up -r "desc(A0)" --hidden | 850 $ hg up -r "desc(A0)" --hidden |
851 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 851 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
852 $ hg tlog | 852 $ hg tlog |
853 o f897c6137566 | 853 o f897c6137566 |
854 | Predecessors: 471f378eab4c | 854 | Predecessors: 1:471f378eab4c |
855 | semi-colon: 471f378eab4c | 855 | semi-colon: 1:471f378eab4c |
856 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 856 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
857 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 857 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
858 | @ 471f378eab4c | 858 | @ 471f378eab4c |
859 |/ | 859 |/ |
860 o ea207398892e | 860 o ea207398892e |
868 @ ea207398892e | 868 @ ea207398892e |
869 | 869 |
870 | 870 |
871 $ hg tlog --hidden | 871 $ hg tlog --hidden |
872 o f897c6137566 | 872 o f897c6137566 |
873 | Predecessors: 0dec01379d3b | 873 | Predecessors: 2:0dec01379d3b |
874 | semi-colon: 0dec01379d3b | 874 | semi-colon: 2:0dec01379d3b |
875 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | 875 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
876 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | 876 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
877 | x 0dec01379d3b | 877 | x 0dec01379d3b |
878 | | Predecessors: 471f378eab4c | 878 | | Predecessors: 1:471f378eab4c |
879 | | semi-colon: 471f378eab4c | 879 | | semi-colon: 1:471f378eab4c |
880 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | 880 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
881 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | 881 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
882 | x 471f378eab4c | 882 | x 471f378eab4c |
883 |/ Predecessors: 0dec01379d3b | 883 |/ Predecessors: 2:0dec01379d3b |
884 | semi-colon: 0dec01379d3b | 884 | semi-colon: 2:0dec01379d3b |
885 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | 885 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
886 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | 886 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
887 @ ea207398892e | 887 @ ea207398892e |
888 | 888 |