Mercurial > evolve
comparison tests/test-evolve-templates.t @ 2495:0db53f48db2d
template: move each template on its own line during tests
This will clarify the various coming changes around template.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 May 2017 16:59:59 +0200 |
| parents | 17bc96b54255 |
| children | 5ed8af9c4a21 |
comparison
equal
deleted
inserted
replaced
| 2494:17bc96b54255 | 2495:0db53f48db2d |
|---|---|
| 10 > [phases] | 10 > [phases] |
| 11 > publish=False | 11 > publish=False |
| 12 > [extensions] | 12 > [extensions] |
| 13 > evolve = | 13 > evolve = |
| 14 > [alias] | 14 > [alias] |
| 15 > tlog = log -G -T '{node|short} Precursors: {precursors} | Successors: {successors} | Fate: {obsfate_quiet}\n' | 15 > tlog = log -G -T '{node|short}\n Precursors: {precursors}\n Successors: {successors}\n Fate: {obsfate_quiet}\n' |
| 16 > EOF | 16 > EOF |
| 17 | 17 |
| 18 Test templates on amended commit | 18 Test templates on amended commit |
| 19 ================================ | 19 ================================ |
| 20 | 20 |
| 64 working directory parent is obsolete! (471f378eab4c) | 64 working directory parent is obsolete! (471f378eab4c) |
| 65 (use 'hg evolve' to update to its successor: d004c8f274b9) | 65 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 66 | 66 |
| 67 Precursors template should show current revision as it is the working copy | 67 Precursors template should show current revision as it is the working copy |
| 68 $ hg tlog | 68 $ hg tlog |
| 69 o d004c8f274b9 Precursors: 471f378eab4c | Successors: | Fate: | 69 o d004c8f274b9 |
| 70 | | 70 | Precursors: 471f378eab4c |
| 71 | @ 471f378eab4c Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 | 71 | Successors: |
| 72 |/ | 72 | Fate: |
| 73 o ea207398892e Precursors: | Successors: | Fate: | 73 | @ 471f378eab4c |
| 74 | 74 |/ Precursors: |
| 75 | Successors: [d004c8f274b9] | |
| 76 | Fate: superseed as d004c8f274b9 | |
| 77 o ea207398892e | |
| 78 Precursors: | |
| 79 Successors: | |
| 80 Fate: | |
| 75 $ hg up 'desc(A1)' --hidden | 81 $ hg up 'desc(A1)' --hidden |
| 76 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 |
| 77 working directory parent is obsolete! (a468dc9b3633) | 83 working directory parent is obsolete! (a468dc9b3633) |
| 78 (use 'hg evolve' to update to its successor: d004c8f274b9) | 84 (use 'hg evolve' to update to its successor: d004c8f274b9) |
| 79 | 85 |
| 80 Precursors template should show current revision as it is the working copy | 86 Precursors template should show current revision as it is the working copy |
| 81 $ hg tlog | 87 $ hg tlog |
| 82 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: | 88 o d004c8f274b9 |
| 83 | | 89 | Precursors: a468dc9b3633 |
| 84 | @ a468dc9b3633 Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 | 90 | Successors: |
| 85 |/ | 91 | Fate: |
| 86 o ea207398892e Precursors: | Successors: | Fate: | 92 | @ a468dc9b3633 |
| 87 | 93 |/ Precursors: |
| 94 | Successors: [d004c8f274b9] | |
| 95 | Fate: superseed as d004c8f274b9 | |
| 96 o ea207398892e | |
| 97 Precursors: | |
| 98 Successors: | |
| 99 Fate: | |
| 88 Precursors template should show the precursor as we force its display with | 100 Precursors template should show the precursor as we force its display with |
| 89 --hidden | 101 --hidden |
| 90 $ hg tlog --hidden | 102 $ hg tlog --hidden |
| 91 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: | 103 o d004c8f274b9 |
| 92 | | 104 | Precursors: a468dc9b3633 |
| 93 | @ a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 | 105 | Successors: |
| 94 |/ | 106 | Fate: |
| 95 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned | 107 | @ a468dc9b3633 |
| 96 | | | 108 |/ Precursors: 471f378eab4c |
| 97 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as a468dc9b3633 | 109 | Successors: [d004c8f274b9] |
| 98 |/ | 110 | Fate: superseed as d004c8f274b9 |
| 99 o ea207398892e Precursors: | Successors: | Fate: | 111 | x f137d23bb3e1 |
| 100 | 112 | | Precursors: |
| 113 | | Successors: | |
| 114 | | Fate: pruned | |
| 115 | x 471f378eab4c | |
| 116 |/ Precursors: | |
| 117 | Successors: [a468dc9b3633] | |
| 118 | Fate: superseed as a468dc9b3633 | |
| 119 o ea207398892e | |
| 120 Precursors: | |
| 121 Successors: | |
| 122 Fate: | |
| 101 | 123 |
| 102 $ hg up 'desc(A2)' | 124 $ hg up 'desc(A2)' |
| 103 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 104 $ hg tlog | 126 $ hg tlog |
| 105 @ d004c8f274b9 Precursors: | Successors: | Fate: | 127 @ d004c8f274b9 |
| 106 | | 128 | Precursors: |
| 107 o ea207398892e Precursors: | Successors: | Fate: | 129 | Successors: |
| 108 | 130 | Fate: |
| 131 o ea207398892e | |
| 132 Precursors: | |
| 133 Successors: | |
| 134 Fate: | |
| 109 $ hg tlog --hidden | 135 $ hg tlog --hidden |
| 110 @ d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: | 136 @ d004c8f274b9 |
| 111 | | 137 | Precursors: a468dc9b3633 |
| 112 | x a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 | 138 | Successors: |
| 113 |/ | 139 | Fate: |
| 114 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned | 140 | x a468dc9b3633 |
| 115 | | | 141 |/ Precursors: 471f378eab4c |
| 116 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as a468dc9b3633 | 142 | Successors: [d004c8f274b9] |
| 117 |/ | 143 | Fate: superseed as d004c8f274b9 |
| 118 o ea207398892e Precursors: | Successors: | Fate: | 144 | x f137d23bb3e1 |
| 119 | 145 | | Precursors: |
| 146 | | Successors: | |
| 147 | | Fate: pruned | |
| 148 | x 471f378eab4c | |
| 149 |/ Precursors: | |
| 150 | Successors: [a468dc9b3633] | |
| 151 | Fate: superseed as a468dc9b3633 | |
| 152 o ea207398892e | |
| 153 Precursors: | |
| 154 Successors: | |
| 155 Fate: | |
| 120 | 156 |
| 121 Test templates with splitted commit | 157 Test templates with splitted commit |
| 122 =================================== | 158 =================================== |
| 123 | 159 |
| 124 $ hg init $TESTTMP/templates-local-split | 160 $ hg init $TESTTMP/templates-local-split |
| 208 working directory parent is obsolete! (471597cad322) | 244 working directory parent is obsolete! (471597cad322) |
| 209 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) | 245 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
| 210 | 246 |
| 211 Precursors template should show current revision as it is the working copy | 247 Precursors template should show current revision as it is the working copy |
| 212 $ hg tlog | 248 $ hg tlog |
| 213 o f257fde29c7a Precursors: 471597cad322 | Successors: | Fate: | 249 o f257fde29c7a |
| 214 | | 250 | Precursors: 471597cad322 |
| 215 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate: | 251 | Successors: |
| 216 | | 252 | Fate: |
| 217 | @ 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a | 253 o 337fec4d2edc |
| 218 |/ | 254 | Precursors: 471597cad322 |
| 219 o ea207398892e Precursors: | Successors: | Fate: | 255 | Successors: |
| 220 | 256 | Fate: |
| 257 | @ 471597cad322 | |
| 258 |/ Precursors: | |
| 259 | Successors: [337fec4d2edc, f257fde29c7a] | |
| 260 | Fate: superseed as 337fec4d2edc,f257fde29c7a | |
| 261 o ea207398892e | |
| 262 Precursors: | |
| 263 Successors: | |
| 264 Fate: | |
| 221 $ hg up f257fde29c7a | 265 $ hg up f257fde29c7a |
| 222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 266 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 223 | 267 |
| 224 Precursors template should not show a precursor as it's not displayed in the | 268 Precursors template should not show a precursor as it's not displayed in the |
| 225 log | 269 log |
| 226 $ hg tlog | 270 $ hg tlog |
| 227 @ f257fde29c7a Precursors: | Successors: | Fate: | 271 @ f257fde29c7a |
| 228 | | 272 | Precursors: |
| 229 o 337fec4d2edc Precursors: | Successors: | Fate: | 273 | Successors: |
| 230 | | 274 | Fate: |
| 231 o ea207398892e Precursors: | Successors: | Fate: | 275 o 337fec4d2edc |
| 232 | 276 | Precursors: |
| 277 | Successors: | |
| 278 | Fate: | |
| 279 o ea207398892e | |
| 280 Precursors: | |
| 281 Successors: | |
| 282 Fate: | |
| 233 Precursors template should show the precursor as we force its display with | 283 Precursors template should show the precursor as we force its display with |
| 234 --hidden | 284 --hidden |
| 235 $ hg tlog --hidden | 285 $ hg tlog --hidden |
| 236 @ f257fde29c7a Precursors: 471597cad322 | Successors: | Fate: | 286 @ f257fde29c7a |
| 237 | | 287 | Precursors: 471597cad322 |
| 238 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate: | 288 | Successors: |
| 239 | | 289 | Fate: |
| 240 | x 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a | 290 o 337fec4d2edc |
| 241 |/ | 291 | Precursors: 471597cad322 |
| 242 o ea207398892e Precursors: | Successors: | Fate: | 292 | Successors: |
| 243 | 293 | Fate: |
| 294 | x 471597cad322 | |
| 295 |/ Precursors: | |
| 296 | Successors: [337fec4d2edc, f257fde29c7a] | |
| 297 | Fate: superseed as 337fec4d2edc,f257fde29c7a | |
| 298 o ea207398892e | |
| 299 Precursors: | |
| 300 Successors: | |
| 301 Fate: | |
| 244 Test templates with folded commit | 302 Test templates with folded commit |
| 245 ============================== | 303 ============================== |
| 246 | 304 |
| 247 Test setup | 305 Test setup |
| 248 ---------- | 306 ---------- |
| 303 working directory parent is obsolete! (471f378eab4c) | 361 working directory parent is obsolete! (471f378eab4c) |
| 304 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 362 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 305 | 363 |
| 306 Precursors template should show current revision as it is the working copy | 364 Precursors template should show current revision as it is the working copy |
| 307 $ hg tlog | 365 $ hg tlog |
| 308 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: | 366 o eb5a0daa2192 |
| 309 | | 367 | Precursors: 471f378eab4c |
| 310 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 368 | Successors: |
| 311 |/ | 369 | Fate: |
| 312 o ea207398892e Precursors: | Successors: | Fate: | 370 | @ 471f378eab4c |
| 313 | 371 |/ Precursors: |
| 372 | Successors: [eb5a0daa2192] | |
| 373 | Fate: superseed as eb5a0daa2192 | |
| 374 o ea207398892e | |
| 375 Precursors: | |
| 376 Successors: | |
| 377 Fate: | |
| 314 $ hg up 'desc(B0)' --hidden | 378 $ hg up 'desc(B0)' --hidden |
| 315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 316 working directory parent is obsolete! (0dec01379d3b) | 380 working directory parent is obsolete! (0dec01379d3b) |
| 317 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 381 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 318 | 382 |
| 319 Precursors template should show both precursors as they should be both | 383 Precursors template should show both precursors as they should be both |
| 320 displayed | 384 displayed |
| 321 $ hg tlog | 385 $ hg tlog |
| 322 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: | 386 o eb5a0daa2192 |
| 323 | | 387 | Precursors: 0dec01379d3b, 471f378eab4c |
| 324 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 388 | Successors: |
| 325 | | | 389 | Fate: |
| 326 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 390 | @ 0dec01379d3b |
| 327 |/ | 391 | | Precursors: |
| 328 o ea207398892e Precursors: | Successors: | Fate: | 392 | | Successors: [eb5a0daa2192] |
| 329 | 393 | | Fate: superseed as eb5a0daa2192 |
| 394 | x 471f378eab4c | |
| 395 |/ Precursors: | |
| 396 | Successors: [eb5a0daa2192] | |
| 397 | Fate: superseed as eb5a0daa2192 | |
| 398 o ea207398892e | |
| 399 Precursors: | |
| 400 Successors: | |
| 401 Fate: | |
| 330 $ hg up 'desc(C0)' | 402 $ hg up 'desc(C0)' |
| 331 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 403 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 332 | 404 |
| 333 Precursors template should not show precursors as it's not displayed in the | 405 Precursors template should not show precursors as it's not displayed in the |
| 334 log | 406 log |
| 335 $ hg tlog | 407 $ hg tlog |
| 336 @ eb5a0daa2192 Precursors: | Successors: | Fate: | 408 @ eb5a0daa2192 |
| 337 | | 409 | Precursors: |
| 338 o ea207398892e Precursors: | Successors: | Fate: | 410 | Successors: |
| 339 | 411 | Fate: |
| 412 o ea207398892e | |
| 413 Precursors: | |
| 414 Successors: | |
| 415 Fate: | |
| 340 Precursors template should show both precursors as we force its display with | 416 Precursors template should show both precursors as we force its display with |
| 341 --hidden | 417 --hidden |
| 342 $ hg tlog --hidden | 418 $ hg tlog --hidden |
| 343 @ eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: | 419 @ eb5a0daa2192 |
| 344 | | 420 | Precursors: 0dec01379d3b, 471f378eab4c |
| 345 | x 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 421 | Successors: |
| 346 | | | 422 | Fate: |
| 347 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 423 | x 0dec01379d3b |
| 348 |/ | 424 | | Precursors: |
| 349 o ea207398892e Precursors: | Successors: | Fate: | 425 | | Successors: [eb5a0daa2192] |
| 350 | 426 | | Fate: superseed as eb5a0daa2192 |
| 427 | x 471f378eab4c | |
| 428 |/ Precursors: | |
| 429 | Successors: [eb5a0daa2192] | |
| 430 | Fate: superseed as eb5a0daa2192 | |
| 431 o ea207398892e | |
| 432 Precursors: | |
| 433 Successors: | |
| 434 Fate: | |
| 351 | 435 |
| 352 Test templates with divergence | 436 Test templates with divergence |
| 353 ============================== | 437 ============================== |
| 354 | 438 |
| 355 Test setup | 439 Test setup |
| 420 working directory parent is obsolete! (471f378eab4c) | 504 working directory parent is obsolete! (471f378eab4c) |
| 421 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) | 505 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) |
| 422 | 506 |
| 423 Precursors template should show current revision as it is the working copy | 507 Precursors template should show current revision as it is the working copy |
| 424 $ hg tlog | 508 $ hg tlog |
| 425 o 019fadeab383 Precursors: 471f378eab4c | Successors: | Fate: | 509 o 019fadeab383 |
| 426 | | 510 | Precursors: 471f378eab4c |
| 427 | o fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: | 511 | Successors: |
| 428 |/ | 512 | Fate: |
| 429 | @ 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [019fadeab383] | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 | 513 | o fdf9bde5129a |
| 430 |/ | 514 |/ Precursors: 471f378eab4c |
| 431 o ea207398892e Precursors: | Successors: | Fate: | 515 | Successors: |
| 432 | 516 | Fate: |
| 517 | @ 471f378eab4c | |
| 518 |/ Precursors: | |
| 519 | Successors: [fdf9bde5129a], [019fadeab383] | |
| 520 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 | |
| 521 o ea207398892e | |
| 522 Precursors: | |
| 523 Successors: | |
| 524 Fate: | |
| 433 $ hg up 'desc(A1)' | 525 $ hg up 'desc(A1)' |
| 434 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 526 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 435 Precursors template should not show precursors as it's not displayed in the | 527 Precursors template should not show precursors as it's not displayed in the |
| 436 log | 528 log |
| 437 $ hg tlog | 529 $ hg tlog |
| 438 o 019fadeab383 Precursors: | Successors: | Fate: | 530 o 019fadeab383 |
| 439 | | 531 | Precursors: |
| 440 | @ fdf9bde5129a Precursors: | Successors: | Fate: | 532 | Successors: |
| 441 |/ | 533 | Fate: |
| 442 o ea207398892e Precursors: | Successors: | Fate: | 534 | @ fdf9bde5129a |
| 443 | 535 |/ Precursors: |
| 536 | Successors: | |
| 537 | Fate: | |
| 538 o ea207398892e | |
| 539 Precursors: | |
| 540 Successors: | |
| 541 Fate: | |
| 444 Precursors template should a precursor as we force its display with --hidden | 542 Precursors template should a precursor as we force its display with --hidden |
| 445 $ hg tlog --hidden | 543 $ hg tlog --hidden |
| 446 o 019fadeab383 Precursors: 65b757b745b9 | Successors: | Fate: | 544 o 019fadeab383 |
| 447 | | 545 | Precursors: 65b757b745b9 |
| 448 | x 65b757b745b9 Precursors: 471f378eab4c | Successors: [019fadeab383] | Fate: superseed as 019fadeab383 | 546 | Successors: |
| 449 |/ | 547 | Fate: |
| 450 | @ fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: | 548 | x 65b757b745b9 |
| 451 |/ | 549 |/ Precursors: 471f378eab4c |
| 452 | x 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [65b757b745b9] | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 | 550 | Successors: [019fadeab383] |
| 453 |/ | 551 | Fate: superseed as 019fadeab383 |
| 454 o ea207398892e Precursors: | Successors: | Fate: | 552 | @ fdf9bde5129a |
| 455 | 553 |/ Precursors: 471f378eab4c |
| 554 | Successors: | |
| 555 | Fate: | |
| 556 | x 471f378eab4c | |
| 557 |/ Precursors: | |
| 558 | Successors: [fdf9bde5129a], [65b757b745b9] | |
| 559 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 | |
| 560 o ea207398892e | |
| 561 Precursors: | |
| 562 Successors: | |
| 563 Fate: | |
| 456 Test templates with amended + folded commit | 564 Test templates with amended + folded commit |
| 457 =========================================== | 565 =========================================== |
| 458 | 566 |
| 459 Test setup | 567 Test setup |
| 460 ---------- | 568 ---------- |
| 526 $ hg up 'desc(A0)' --hidden | 634 $ hg up 'desc(A0)' --hidden |
| 527 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 635 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 528 working directory parent is obsolete! (471f378eab4c) | 636 working directory parent is obsolete! (471f378eab4c) |
| 529 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 637 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 530 $ hg tlog | 638 $ hg tlog |
| 531 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: | 639 o eb5a0daa2192 |
| 532 | | 640 | Precursors: 471f378eab4c |
| 533 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 641 | Successors: |
| 534 |/ | 642 | Fate: |
| 535 o ea207398892e Precursors: | Successors: | Fate: | 643 | @ 471f378eab4c |
| 536 | 644 |/ Precursors: |
| 645 | Successors: [eb5a0daa2192] | |
| 646 | Fate: superseed as eb5a0daa2192 | |
| 647 o ea207398892e | |
| 648 Precursors: | |
| 649 Successors: | |
| 650 Fate: | |
| 537 $ hg up 'desc(B0)' --hidden | 651 $ hg up 'desc(B0)' --hidden |
| 538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 652 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 539 working directory parent is obsolete! (0dec01379d3b) | 653 working directory parent is obsolete! (0dec01379d3b) |
| 540 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 654 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 541 $ hg tlog | 655 $ hg tlog |
| 542 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: | 656 o eb5a0daa2192 |
| 543 | | 657 | Precursors: 0dec01379d3b, 471f378eab4c |
| 544 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 658 | Successors: |
| 545 | | | 659 | Fate: |
| 546 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 660 | @ 0dec01379d3b |
| 547 |/ | 661 | | Precursors: |
| 548 o ea207398892e Precursors: | Successors: | Fate: | 662 | | Successors: [eb5a0daa2192] |
| 549 | 663 | | Fate: superseed as eb5a0daa2192 |
| 664 | x 471f378eab4c | |
| 665 |/ Precursors: | |
| 666 | Successors: [eb5a0daa2192] | |
| 667 | Fate: superseed as eb5a0daa2192 | |
| 668 o ea207398892e | |
| 669 Precursors: | |
| 670 Successors: | |
| 671 Fate: | |
| 550 $ hg up 'desc(B1)' --hidden | 672 $ hg up 'desc(B1)' --hidden |
| 551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 673 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 552 working directory parent is obsolete! (b7ea6d14e664) | 674 working directory parent is obsolete! (b7ea6d14e664) |
| 553 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 675 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 554 $ hg tlog | 676 $ hg tlog |
| 555 o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: | 677 o eb5a0daa2192 |
| 556 | | 678 | Precursors: 471f378eab4c, b7ea6d14e664 |
| 557 | @ b7ea6d14e664 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 679 | Successors: |
| 558 | | | 680 | Fate: |
| 559 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 681 | @ b7ea6d14e664 |
| 560 |/ | 682 | | Precursors: |
| 561 o ea207398892e Precursors: | Successors: | Fate: | 683 | | Successors: [eb5a0daa2192] |
| 562 | 684 | | Fate: superseed as eb5a0daa2192 |
| 685 | x 471f378eab4c | |
| 686 |/ Precursors: | |
| 687 | Successors: [eb5a0daa2192] | |
| 688 | Fate: superseed as eb5a0daa2192 | |
| 689 o ea207398892e | |
| 690 Precursors: | |
| 691 Successors: | |
| 692 Fate: | |
| 563 $ hg up 'desc(C0)' | 693 $ hg up 'desc(C0)' |
| 564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 694 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 565 $ hg tlog | 695 $ hg tlog |
| 566 @ eb5a0daa2192 Precursors: | Successors: | Fate: | 696 @ eb5a0daa2192 |
| 567 | | 697 | Precursors: |
| 568 o ea207398892e Precursors: | Successors: | Fate: | 698 | Successors: |
| 569 | 699 | Fate: |
| 700 o ea207398892e | |
| 701 Precursors: | |
| 702 Successors: | |
| 703 Fate: | |
| 570 $ hg tlog --hidden | 704 $ hg tlog --hidden |
| 571 @ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: | 705 @ eb5a0daa2192 |
| 572 | | 706 | Precursors: 471f378eab4c, b7ea6d14e664 |
| 573 | x b7ea6d14e664 Precursors: 0dec01379d3b | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 707 | Successors: |
| 574 | | | 708 | Fate: |
| 575 | | x 0dec01379d3b Precursors: | Successors: [b7ea6d14e664] | Fate: superseed as b7ea6d14e664 | 709 | x b7ea6d14e664 |
| 576 | |/ | 710 | | Precursors: 0dec01379d3b |
| 577 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 | 711 | | Successors: [eb5a0daa2192] |
| 578 |/ | 712 | | Fate: superseed as eb5a0daa2192 |
| 579 o ea207398892e Precursors: | Successors: | Fate: | 713 | | x 0dec01379d3b |
| 580 | 714 | |/ Precursors: |
| 715 | | Successors: [b7ea6d14e664] | |
| 716 | | Fate: superseed as b7ea6d14e664 | |
| 717 | x 471f378eab4c | |
| 718 |/ Precursors: | |
| 719 | Successors: [eb5a0daa2192] | |
| 720 | Fate: superseed as eb5a0daa2192 | |
| 721 o ea207398892e | |
| 722 Precursors: | |
| 723 Successors: | |
| 724 Fate: | |
| 581 | 725 |
| 582 Test template with pushed and pulled obs markers | 726 Test template with pushed and pulled obs markers |
| 583 ============================================== | 727 ============================================== |
| 584 | 728 |
| 585 Test setup | 729 Test setup |
| 665 | 809 |
| 666 Check templates | 810 Check templates |
| 667 --------------- | 811 --------------- |
| 668 | 812 |
| 669 $ hg tlog | 813 $ hg tlog |
| 670 o 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: | 814 o 7a230b46bf61 |
| 671 | | 815 | Precursors: 471f378eab4c |
| 672 | @ 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61 | 816 | Successors: |
| 673 |/ | 817 | Fate: |
| 674 o ea207398892e Precursors: | Successors: | Fate: | 818 | @ 471f378eab4c |
| 675 | 819 |/ Precursors: |
| 820 | Successors: [7a230b46bf61] | |
| 821 | Fate: superseed as 7a230b46bf61 | |
| 822 o ea207398892e | |
| 823 Precursors: | |
| 824 Successors: | |
| 825 Fate: | |
| 676 $ hg up 'desc(A2)' | 826 $ hg up 'desc(A2)' |
| 677 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 827 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 678 $ hg tlog | 828 $ hg tlog |
| 679 @ 7a230b46bf61 Precursors: | Successors: | Fate: | 829 @ 7a230b46bf61 |
| 680 | | 830 | Precursors: |
| 681 o ea207398892e Precursors: | Successors: | Fate: | 831 | Successors: |
| 682 | 832 | Fate: |
| 833 o ea207398892e | |
| 834 Precursors: | |
| 835 Successors: | |
| 836 Fate: | |
| 683 $ hg tlog --hidden | 837 $ hg tlog --hidden |
| 684 @ 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: | 838 @ 7a230b46bf61 |
| 685 | | 839 | Precursors: 471f378eab4c |
| 686 | x 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61 | 840 | Successors: |
| 687 |/ | 841 | Fate: |
| 688 o ea207398892e Precursors: | Successors: | Fate: | 842 | x 471f378eab4c |
| 689 | 843 |/ Precursors: |
| 844 | Successors: [7a230b46bf61] | |
| 845 | Fate: superseed as 7a230b46bf61 | |
| 846 o ea207398892e | |
| 847 Precursors: | |
| 848 Successors: | |
| 849 Fate: |