equal
deleted
inserted
replaced
878 2 new unstable changesets |
878 2 new unstable changesets |
879 |
879 |
880 $ hg up 8 |
880 $ hg up 8 |
881 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
881 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
882 $ hg evolve |
882 $ hg evolve |
883 nothing to evolve here |
883 nothing to evolve on current working copy parent |
884 (2 troubled changesets, do you want --any ?) |
884 (2 other unstable in the repository, do you want --any or --rev) |
885 [2] |
885 [2] |
886 |
886 |
887 |
887 |
888 Evolve disables active bookmarks. |
888 Evolve disables active bookmarks. |
889 |
889 |
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 abort: no troubled changes in the specified revisions |
1020 set of specified revisions is empty |
1021 [255] |
1021 [1] |
1022 |
1022 |
1023 $ hg evolve --rev "14::" --bumped |
1023 $ hg evolve --rev "14::" --bumped |
1024 abort: no troubled changes in the specified revisions |
1024 no bumped changesets in specified revisions |
1025 [255] |
1025 (do you want to use --unstable) |
|
1026 [2] |
1026 $ hg evolve --rev "14::" --unstable |
1027 $ hg evolve --rev "14::" --unstable |
1027 move:[15] add gg |
1028 move:[15] add gg |
1028 atop:[18] a3 |
1029 atop:[18] a3 |
1029 move:[16] add gh |
1030 move:[16] add gh |
1030 atop:[18] a3 |
1031 atop:[18] a3 |