Mercurial > evolve
comparison tests/test-evolve-orphan-merge.t @ 6042:1cbafebe874b
tests: add {instabilities} to the common glog alias
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 21 Sep 2021 22:11:31 +0300 |
| parents | 6b7ef731141b |
| children | c0921b5277a0 b1d1f4ade142 |
comparison
equal
deleted
inserted
replaced
| 6041:6b7ef731141b | 6042:1cbafebe874b |
|---|---|
| 54 | 54 |
| 55 $ hg glog | 55 $ hg glog |
| 56 @ 4:64370c9805e7 added b | 56 @ 4:64370c9805e7 added b |
| 57 | () draft | 57 | () draft |
| 58 | * 3:3b2b6f4652ee merging a and b | 58 | * 3:3b2b6f4652ee merging a and b |
| 59 | |\ () draft | 59 | |\ () draft orphan |
| 60 +---x 2:d76850646258 added b | 60 +---x 2:d76850646258 added b |
| 61 | | () draft | 61 | | () draft |
| 62 | o 1:c7586e2a9264 added a | 62 | o 1:c7586e2a9264 added a |
| 63 |/ () draft | 63 |/ () draft |
| 64 o 0:8fa14d15e168 added hgignore | 64 o 0:8fa14d15e168 added hgignore |
| 99 | 99 |
| 100 $ hg glog | 100 $ hg glog |
| 101 @ 6:3d41537b44ca added a | 101 @ 6:3d41537b44ca added a |
| 102 | () draft | 102 | () draft |
| 103 | * 5:91fd62122a4b merging a and b | 103 | * 5:91fd62122a4b merging a and b |
| 104 | |\ () draft | 104 | |\ () draft orphan |
| 105 +---o 4:64370c9805e7 added b | 105 +---o 4:64370c9805e7 added b |
| 106 | | () draft | 106 | | () draft |
| 107 | x 1:c7586e2a9264 added a | 107 | x 1:c7586e2a9264 added a |
| 108 |/ () draft | 108 |/ () draft |
| 109 o 0:8fa14d15e168 added hgignore | 109 o 0:8fa14d15e168 added hgignore |
| 192 | 192 |
| 193 $ hg glog | 193 $ hg glog |
| 194 @ 11:31c317b7bdb1 foo to c | 194 @ 11:31c317b7bdb1 foo to c |
| 195 | () draft | 195 | () draft |
| 196 | * 10:fd41d25a3e90 foobar to c | 196 | * 10:fd41d25a3e90 foobar to c |
| 197 | |\ () draft | 197 | |\ () draft orphan |
| 198 +---o 9:d0f84b25d4e3 bar to c | 198 +---o 9:d0f84b25d4e3 bar to c |
| 199 | | () draft | 199 | | () draft |
| 200 | x 8:1c165c673853 foo to c | 200 | x 8:1c165c673853 foo to c |
| 201 |/ () draft | 201 |/ () draft |
| 202 o 0:8fa14d15e168 added hgignore | 202 o 0:8fa14d15e168 added hgignore |
| 248 | 248 |
| 249 $ hg glog | 249 $ hg glog |
| 250 @ 13:928097d0b5b5 foo to c | 250 @ 13:928097d0b5b5 foo to c |
| 251 | () draft | 251 | () draft |
| 252 | * 12:c5405d2da7a1 foobar to c | 252 | * 12:c5405d2da7a1 foobar to c |
| 253 | |\ () draft | 253 | |\ () draft orphan |
| 254 +---x 11:31c317b7bdb1 foo to c | 254 +---x 11:31c317b7bdb1 foo to c |
| 255 | | () draft | 255 | | () draft |
| 256 | o 9:d0f84b25d4e3 bar to c | 256 | o 9:d0f84b25d4e3 bar to c |
| 257 |/ () draft | 257 |/ () draft |
| 258 o 0:8fa14d15e168 added hgignore | 258 o 0:8fa14d15e168 added hgignore |
| 323 | 323 |
| 324 $ hg glog | 324 $ hg glog |
| 325 @ 20:fccc9de66799 added l | 325 @ 20:fccc9de66799 added l |
| 326 | () draft | 326 | () draft |
| 327 | * 19:190763373d8b merge commit | 327 | * 19:190763373d8b merge commit |
| 328 | |\ () draft | 328 | |\ () draft orphan |
| 329 | | o 18:863d11043c67 added y | 329 | | o 18:863d11043c67 added y |
| 330 | | | () draft | 330 | | | () draft |
| 331 +---o 17:3f2247835c1d added x | 331 +---o 17:3f2247835c1d added x |
| 332 | | () draft | 332 | | () draft |
| 333 | * 16:e44dc179e7f5 added m | 333 | * 16:e44dc179e7f5 added m |
| 334 | | () draft | 334 | | () draft orphan |
| 335 | x 15:8634bee7bf1e added l | 335 | x 15:8634bee7bf1e added l |
| 336 |/ () draft | 336 |/ () draft |
| 337 o 0:8fa14d15e168 added hgignore | 337 o 0:8fa14d15e168 added hgignore |
| 338 () draft | 338 () draft |
| 339 $ hg evolve --all --update | 339 $ hg evolve --all --update |
| 390 @ 25:cdf6547da25f added x | 390 @ 25:cdf6547da25f added x |
| 391 | () draft | 391 | () draft |
| 392 | o 24:3f371171d767 added l | 392 | o 24:3f371171d767 added l |
| 393 |/ () draft | 393 |/ () draft |
| 394 | * 23:7b78a9784f3e merged l and x | 394 | * 23:7b78a9784f3e merged l and x |
| 395 | |\ () draft | 395 | |\ () draft orphan |
| 396 +---x 20:fccc9de66799 added l | 396 +---x 20:fccc9de66799 added l |
| 397 | | () draft | 397 | | () draft |
| 398 | x 17:3f2247835c1d added x | 398 | x 17:3f2247835c1d added x |
| 399 |/ () draft | 399 |/ () draft |
| 400 o 0:8fa14d15e168 added hgignore | 400 o 0:8fa14d15e168 added hgignore |
| 450 $ hg prune -r cdf6547da25f | 450 $ hg prune -r cdf6547da25f |
| 451 1 changesets pruned | 451 1 changesets pruned |
| 452 1 new orphan changesets | 452 1 new orphan changesets |
| 453 $ hg glog | 453 $ hg glog |
| 454 @ 27:adb665a78e08 merged l and x | 454 @ 27:adb665a78e08 merged l and x |
| 455 |\ () draft | 455 |\ () draft orphan |
| 456 | x 25:cdf6547da25f added x | 456 | x 25:cdf6547da25f added x |
| 457 | | () draft | 457 | | () draft |
| 458 o | 24:3f371171d767 added l | 458 o | 24:3f371171d767 added l |
| 459 |/ () draft | 459 |/ () draft |
| 460 o 0:8fa14d15e168 added hgignore | 460 o 0:8fa14d15e168 added hgignore |
| 489 1 changesets pruned | 489 1 changesets pruned |
| 490 1 new orphan changesets | 490 1 new orphan changesets |
| 491 | 491 |
| 492 $ hg glog | 492 $ hg glog |
| 493 @ 28:fb8fe870ae7d merged l and x | 493 @ 28:fb8fe870ae7d merged l and x |
| 494 |\ () draft | 494 |\ () draft orphan |
| 495 | x 24:3f371171d767 added l | 495 | x 24:3f371171d767 added l |
| 496 |/ () draft | 496 |/ () draft |
| 497 o 0:8fa14d15e168 added hgignore | 497 o 0:8fa14d15e168 added hgignore |
| 498 () draft | 498 () draft |
| 499 | 499 |
| 554 1 changesets pruned | 554 1 changesets pruned |
| 555 1 new orphan changesets | 555 1 new orphan changesets |
| 556 | 556 |
| 557 $ hg glog | 557 $ hg glog |
| 558 @ 30:32beb84b9dbc merge commit | 558 @ 30:32beb84b9dbc merge commit |
| 559 |\ () draft | 559 |\ () draft orphan |
| 560 | x 29:f3ba8b99bb6f added foo | 560 | x 29:f3ba8b99bb6f added foo |
| 561 | () draft | 561 | () draft |
| 562 o 0:8fa14d15e168 added hgignore | 562 o 0:8fa14d15e168 added hgignore |
| 563 () draft | 563 () draft |
| 564 | 564 |