1299 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1299 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1300 $ mkcommit c5_ |
1300 $ mkcommit c5_ |
1301 created new head |
1301 created new head |
1302 $ hg prune '26 + 27' |
1302 $ hg prune '26 + 27' |
1303 abort: cannot prune in the middle of a stack |
1303 abort: cannot prune in the middle of a stack |
|
1304 (new unstable changesets are not allowed) |
1304 [255] |
1305 [255] |
1305 $ hg prune '19::28' |
1306 $ hg prune '19::28' |
1306 abort: cannot prune in the middle of a stack |
1307 abort: cannot prune in the middle of a stack |
|
1308 (new unstable changesets are not allowed) |
1307 [255] |
1309 [255] |
1308 $ hg prune '26::' |
1310 $ hg prune '26::' |
1309 3 changesets pruned |
1311 3 changesets pruned |
1310 $ glog -r "18::" |
1312 $ glog -r "18::" |
1311 @ 29:2251801b6c91@default(draft) add c5_ |
1313 @ 29:2251801b6c91@default(draft) add c5_ |
1336 | |
1338 | |
1337 ~ |
1339 ~ |
1338 |
1340 |
1339 $ hg fold --exact "19 + 18" |
1341 $ hg fold --exact "19 + 18" |
1340 abort: cannot fold chain not ending with a head or with branching |
1342 abort: cannot fold chain not ending with a head or with branching |
|
1343 (new unstable changesets are not allowed) |
1341 [255] |
1344 [255] |
1342 $ hg fold --exact "18::29" |
1345 $ hg fold --exact "18::29" |
1343 abort: cannot fold chain not ending with a head or with branching |
1346 abort: cannot fold chain not ending with a head or with branching |
|
1347 (new unstable changesets are not allowed) |
1344 [255] |
1348 [255] |
1345 $ hg fold --exact "19::" |
1349 $ hg fold --exact "19::" |
1346 2 changesets folded |
1350 2 changesets folded |
1347 |
1351 |
1348 Check that evolve shows error while handling split commits |
1352 Check that evolve shows error while handling split commits |
1481 abort: cannot fold non-linear revisions (multiple heads given) |
1485 abort: cannot fold non-linear revisions (multiple heads given) |
1482 [255] |
1486 [255] |
1483 check that metaedit respects allowunstable |
1487 check that metaedit respects allowunstable |
1484 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
1488 $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands' |
1485 abort: cannot edit commit information in the middle of a stack |
1489 abort: cannot edit commit information in the middle of a stack |
1486 (c904da5245b0 will be affected) |
1490 (c904da5245b0 will become unstable and new unstable changes are not allowed) |
1487 [255] |
1491 [255] |
1488 $ hg metaedit '18::20' --fold --config 'experimental.evolution=createmarkers, allnewcommands' |
1492 $ hg metaedit '18::20' --fold --config 'experimental.evolution=createmarkers, allnewcommands' |
1489 abort: cannot fold chain not ending with a head or with branching |
1493 abort: cannot fold chain not ending with a head or with branching |
|
1494 (new unstable changesets are not allowed) |
1490 [255] |
1495 [255] |
1491 $ hg metaedit --user foobar |
1496 $ hg metaedit --user foobar |
1492 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1497 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1493 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1498 $ hg log --template '{rev}: {author}\n' -r '42:' --hidden |
1494 42: test |
1499 42: test |