equal
deleted
inserted
replaced
330 |/ |
330 |/ |
331 o 6 feature-A: a nifty feature - test |
331 o 6 feature-A: a nifty feature - test |
332 | |
332 | |
333 o 0 : base - test |
333 o 0 : base - test |
334 |
334 |
335 $ hg evolve --any --traceback |
335 $ hg evolve --any --traceback --bumped |
336 recreate:[8] another feature that rox |
336 recreate:[8] another feature that rox |
337 atop:[7] another feature (child of ba0ec09b1bab) |
337 atop:[7] another feature (child of ba0ec09b1bab) |
338 computing new diff |
338 computing new diff |
339 committed as 476d0454d60e |
339 committed as 476d0454d60e |
340 working directory is now at 476d0454d60e |
340 working directory is now at 476d0454d60e |
957 | | |
957 | | |
958 | x 7 : a1_ - test |
958 | x 7 : a1_ - test |
959 |/ |
959 |/ |
960 o 0 : a0 - test |
960 o 0 : a0 - test |
961 |
961 |
962 $ hg evolve -r 12 |
962 $ hg evolve -r 12 --bumped |
963 recreate:[12] add new file bumped |
963 recreate:[12] add new file bumped |
964 atop:[11] a2 |
964 atop:[11] a2 |
965 computing new diff |
965 computing new diff |
966 committed as d66b1e328488 |
966 committed as d66b1e328488 |
967 working directory is now at d66b1e328488 |
967 working directory is now at d66b1e328488 |
1015 o 0 : a0 - test |
1015 o 0 : a0 - test |
1016 |
1016 |
1017 |
1017 |
1018 Evolving an empty revset should do nothing |
1018 Evolving an empty revset should do nothing |
1019 $ hg evolve --rev "16 and 15" |
1019 $ hg evolve --rev "16 and 15" |
1020 No troubled changes in the specified revisions |
1020 abort: no troubled changes in the specified revisions |
1021 |
1021 [255] |
1022 $ hg evolve --rev "14::" |
1022 |
|
1023 $ hg evolve --rev "14::" --bumped |
|
1024 abort: no troubled changes in the specified revisions |
|
1025 [255] |
|
1026 $ hg evolve --rev "14::" --unstable |
1023 move:[15] add gg |
1027 move:[15] add gg |
1024 atop:[18] a3 |
1028 atop:[18] a3 |
1025 move:[16] add gh |
1029 move:[16] add gh |
1026 atop:[18] a3 |
1030 atop:[18] a3 |
1027 working directory is now at db3d894869b0 |
1031 working directory is now at db3d894869b0 |