Mercurial > evolve
comparison tests/test-evolve.t @ 1397:35f2f54b557c
evolve: make prune respect allowunsable
Before this patch, the prune command was performing the same way regardless
of the value of experimental.evolution.
With this patch if the configuration does not allow unstability, prune won't
create instability.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Fri, 19 Jun 2015 11:03:51 -0700 |
parents | 0799c5831a3d |
children | 7ddcbf5469bc |
comparison
equal
deleted
inserted
replaced
1396:ba95cec18fe9 | 1397:35f2f54b557c |
---|---|
1102 | | | 1102 | | |
1103 o | 19:10ffdd7e3cc9@default(draft) add gg | 1103 o | 19:10ffdd7e3cc9@default(draft) add gg |
1104 |/ | 1104 |/ |
1105 o 18:0bb66d4c1968@default(draft) a3 | 1105 o 18:0bb66d4c1968@default(draft) a3 |
1106 | | 1106 | |
1107 | |
1108 Check that prune respects the allowunstable option | |
1109 $ hg up -C . | |
1110 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1111 $ hg evolve --rev "22::" | |
1112 move:[22] add j2 | |
1113 atop:[26] add j1 | |
1114 move:[23] add j3 | |
1115 atop:[27] add j2 | |
1116 working directory is now at 920a35e8dbd0 | |
1117 $ glog -r "18::" | |
1118 @ 28:920a35e8dbd0@default(draft) add j3 | |
1119 | | |
1120 o 27:31e050d895dd@default(draft) add j2 | |
1121 | | |
1122 o 26:04b32348803e@default(draft) add j1 | |
1123 | | |
1124 | o 20:db3d894869b0@default(draft) add gh | |
1125 | | | |
1126 o | 19:10ffdd7e3cc9@default(draft) add gg | |
1127 |/ | |
1128 o 18:0bb66d4c1968@default(draft) a3 | |
1129 | | |
1130 $ hg up 19 | |
1131 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1132 $ mkcommit c5_ | |
1133 created new head | |
1134 $ hg prune '26 + 27' | |
1135 abort: cannot prune in the middle of a stack | |
1136 [255] | |
1137 $ hg prune '19::28' | |
1138 abort: cannot prune in the middle of a stack | |
1139 [255] | |
1140 $ hg prune '26::' | |
1141 3 changesets pruned | |
1142 $ glog -r "18::" | |
1143 @ 29:5a6c53544778@default(draft) add c5_ | |
1144 | | |
1145 | o 20:db3d894869b0@default(draft) add gh | |
1146 | | | |
1147 o | 19:10ffdd7e3cc9@default(draft) add gg | |
1148 |/ | |
1149 o 18:0bb66d4c1968@default(draft) a3 | |
1150 | |