1237 $ hg fold --exact "18::29" |
1237 $ hg fold --exact "18::29" |
1238 abort: cannot fold chain not ending with a head or with branching |
1238 abort: cannot fold chain not ending with a head or with branching |
1239 [255] |
1239 [255] |
1240 $ hg fold --exact "19::" |
1240 $ hg fold --exact "19::" |
1241 2 changesets folded |
1241 2 changesets folded |
|
1242 |
|
1243 Check that evolve shows error while handling split commits |
|
1244 -------------------------------------- |
|
1245 |
|
1246 $ cat >> $HGRCPATH <<EOF |
|
1247 > [experimental] |
|
1248 > evolution=all |
|
1249 > EOF |
|
1250 |
|
1251 $ glog -r "18::" |
|
1252 o 31:5cc6eda0f00d@default(draft) add gg |
|
1253 | |
|
1254 | @ 30:30ecefd67c0a@default(draft) add unstableifparentisfolded |
|
1255 |/ |
|
1256 | o 20:db3d894869b0@default(draft) add gh |
|
1257 |/ |
|
1258 o 18:0bb66d4c1968@default(draft) a3 |
|
1259 | |
|
1260 |
|
1261 Create a split commit |
|
1262 $ printf "oo" > oo; |
|
1263 $ printf "pp" > pp; |
|
1264 $ hg add oo pp |
|
1265 $ hg commit -m "oo+pp" |
|
1266 $ mkcommit uu |
|
1267 $ hg up 30 |
|
1268 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1269 $ printf "oo" > oo; |
|
1270 $ hg add oo |
|
1271 $ hg commit -m "_oo" |
|
1272 created new head |
|
1273 $ printf "pp" > pp; |
|
1274 $ hg add pp |
|
1275 $ hg commit -m "_pp" |
|
1276 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" |
|
1277 1 changesets pruned |
|
1278 1 new unstable changesets |
|
1279 $ glog -r "18::" |
|
1280 @ 35:072908d77206@default(draft) _pp |
|
1281 | |
|
1282 o 34:68e429987343@default(draft) _oo |
|
1283 | |
|
1284 | o 33:030868870864@default(draft) add uu |
|
1285 | | |
|
1286 | x 32:7e9688cf0a1b@default(draft) oo+pp |
|
1287 |/ |
|
1288 | o 31:5cc6eda0f00d@default(draft) add gg |
|
1289 | | |
|
1290 o | 30:30ecefd67c0a@default(draft) add unstableifparentisfolded |
|
1291 |/ |
|
1292 | o 20:db3d894869b0@default(draft) add gh |
|
1293 |/ |
|
1294 o 18:0bb66d4c1968@default(draft) a3 |
|
1295 | |
|
1296 $ hg evolve --rev "18::" |
|
1297 does not handle split parents yet |
|
1298 |
|
1299 |