Mercurial > evolve
comparison tests/test-evolve.t @ 2836:feaa52680682
log: bumped was renamed into phasedivergent
Bumped was renamed into phasedivergent, update tests.
Match 9c27a2891b75 mercurial changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 10 Aug 2017 19:31:55 +0200 |
| parents | 38db1466c6fb |
| children | 9688988472da |
comparison
equal
deleted
inserted
replaced
| 2835:20c2499ce8bc | 2836:feaa52680682 |
|---|---|
| 410 |/ | 410 |/ |
| 411 o 6 feature-A: a nifty feature - test | 411 o 6 feature-A: a nifty feature - test |
| 412 | | 412 | |
| 413 o 0 : base - test | 413 o 0 : base - test |
| 414 | 414 |
| 415 $ hg evolve --any --traceback --bumped | 415 $ hg evolve --any --traceback --phasedivergent |
| 416 recreate:[8] another feature that rox | 416 recreate:[8] another feature that rox |
| 417 atop:[7] another feature (child of ba0ec09b1bab) | 417 atop:[7] another feature (child of ba0ec09b1bab) |
| 418 computing new diff | 418 computing new diff |
| 419 committed as 6707c5e1c49d | 419 committed as 6707c5e1c49d |
| 420 working directory is now at 6707c5e1c49d | 420 working directory is now at 6707c5e1c49d |
| 1047 | | | 1047 | | |
| 1048 | x 7 : a1_ - test | 1048 | x 7 : a1_ - test |
| 1049 |/ | 1049 |/ |
| 1050 o 0 : a0 - test | 1050 o 0 : a0 - test |
| 1051 | 1051 |
| 1052 $ hg evolve -r 12 --bumped | 1052 $ hg evolve -r 12 --phasedivergent |
| 1053 recreate:[12] add new file bumped | 1053 recreate:[12] add new file bumped |
| 1054 atop:[11] a2 | 1054 atop:[11] a2 |
| 1055 computing new diff | 1055 computing new diff |
| 1056 committed as f15d32934071 | 1056 committed as f15d32934071 |
| 1057 working directory is now at f15d32934071 | 1057 working directory is now at f15d32934071 |
| 1108 Evolving an empty revset should do nothing | 1108 Evolving an empty revset should do nothing |
| 1109 $ hg evolve --rev "16 and 15" | 1109 $ hg evolve --rev "16 and 15" |
| 1110 set of specified revisions is empty | 1110 set of specified revisions is empty |
| 1111 [1] | 1111 [1] |
| 1112 | 1112 |
| 1113 $ hg evolve --rev "14::" --bumped | 1113 $ hg evolve --rev "14::" --phasedivergent |
| 1114 no bumped changesets in specified revisions | 1114 no phasedivergent changesets in specified revisions |
| 1115 (do you want to use --orphan) | 1115 (do you want to use --orphan) |
| 1116 [2] | 1116 [2] |
| 1117 $ hg evolve --rev "14::" --orphan | 1117 $ hg evolve --rev "14::" --orphan |
| 1118 move:[15] add gg | 1118 move:[15] add gg |
| 1119 atop:[18] a3 | 1119 atop:[18] a3 |