1153 $ hg prune 33:: |
1153 $ hg prune 33:: |
1154 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1154 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1155 working directory now at 4c0bc042ef3b |
1155 working directory now at 4c0bc042ef3b |
1156 3 changesets pruned |
1156 3 changesets pruned |
1157 |
1157 |
|
1158 Evolve --rev more complex case: two sets of stacks one with prune an no successor, the other one |
|
1159 partially solvable |
|
1160 |
|
1161 First set of stack: |
|
1162 $ mkstack 25 c1_ c2_ c3_ c4_ >/dev/null |
|
1163 $ mkstack 25 c1prime c2prime >/dev/null |
|
1164 $ mkstack 25 c1second >/dev/null |
|
1165 $ hg prune `shaof c1_` -s `shaof c1prime` |
|
1166 1 changesets pruned |
|
1167 3 new unstable changesets |
|
1168 $ hg prune `shaof c2_` -s `shaof c2prime` |
|
1169 1 changesets pruned |
|
1170 $ hg prune `shaof c1prime` -s `shaof c1second` |
|
1171 1 changesets pruned |
|
1172 1 new unstable changesets |
|
1173 |
|
1174 Second set of stack with no successor for b2_: |
|
1175 $ mkstack 25 b1_ b2_ b3_ b4_ >/dev/null |
|
1176 $ mkstack 25 b1prime b3prime >/dev/null |
|
1177 $ hg prune `shaof b1_` -s `shaof b1prime` |
|
1178 1 changesets pruned |
|
1179 3 new unstable changesets |
|
1180 $ hg prune `shaof b3_` -s `shaof b3prime` |
|
1181 1 changesets pruned |
|
1182 $ hg prune `shaof b2_` |
|
1183 1 changesets pruned |
|
1184 |
|
1185 $ glog -r "25::" |
|
1186 @ 48:2b5cbe59aeca@default(draft) add b3prime |
|
1187 | |
|
1188 o 47:aa4f5bf8925e@default(draft) add b1prime |
|
1189 | |
|
1190 | o 46:26b828ec5bcf@default(draft) add b4_ |
|
1191 | | |
|
1192 | x 45:4f07e8c054ba@default(draft) add b3_ |
|
1193 | | |
|
1194 | x 44:3973f60bfa8c@default(draft) add b2_ |
|
1195 | | |
|
1196 | x 43:cddd50881a87@default(draft) add b1_ |
|
1197 |/ |
|
1198 | o 42:4a34f6744d4b@default(draft) add c1second |
|
1199 |/ |
|
1200 | o 41:1a00113a0d9a@default(draft) add c2prime |
|
1201 | | |
|
1202 | x 40:c19e337376fa@default(draft) add c1prime |
|
1203 |/ |
|
1204 | o 39:68e72c885d18@default(draft) add c4_ |
|
1205 | | |
|
1206 | o 38:28172de7eb73@default(draft) add c3_ |
|
1207 | | |
|
1208 | x 37:e2c8f75d4ecc@default(draft) add c2_ |
|
1209 | | |
|
1210 | x 36:4ce6da951588@default(draft) add c1_ |
|
1211 |/ |
|
1212 o 25:4c0bc042ef3b@default(draft) add j1 |
|
1213 | |
|
1214 |
|
1215 Solve the full second stack and only part of the first one |
|
1216 $ echo "(25::) - $(shaof c3_)" |
|
1217 (25::) - 28172de7eb73578cf665e868a265caf2a2655c66 |
|
1218 $ hg evolve --rev "(25::) - $(shaof c3_)" |
|
1219 cannot solve instability of 68e72c885d18, skipping |
|
1220 move:[41] add c2prime |
|
1221 atop:[42] add c1second |
|
1222 move:[46] add b4_ |
|
1223 atop:[48] add b3prime |
|
1224 working directory is now at e543e9e71376 |
|
1225 |
|
1226 Cleanup |
|
1227 $ hg evolve --rev "(25::)" |
|
1228 move:[38] add c3_ |
|
1229 atop:[49] add c2prime |
|
1230 move:[39] add c4_ |
|
1231 atop:[51] add c3_ |
|
1232 working directory is now at 456e647fbe11 |
|
1233 $ glog -r "25::" |
|
1234 @ 52:456e647fbe11@default(draft) add c4_ |
|
1235 | |
|
1236 o 51:07aaa06da467@default(draft) add c3_ |
|
1237 | |
|
1238 | o 50:e543e9e71376@default(draft) add b4_ |
|
1239 | | |
|
1240 o | 49:9379d7237601@default(draft) add c2prime |
|
1241 | | |
|
1242 | o 48:2b5cbe59aeca@default(draft) add b3prime |
|
1243 | | |
|
1244 | o 47:aa4f5bf8925e@default(draft) add b1prime |
|
1245 | | |
|
1246 o | 42:4a34f6744d4b@default(draft) add c1second |
|
1247 |/ |
|
1248 o 25:4c0bc042ef3b@default(draft) add j1 |
|
1249 | |
|
1250 |