681 |/ |
681 |/ |
682 o 0:8685c6d34325@default(draft) add 0 |
682 o 0:8685c6d34325@default(draft) add 0 |
683 |
683 |
684 |
684 |
685 Test fold |
685 Test fold |
|
686 (most of the testing have been moved to test-fold |
686 |
687 |
687 $ rm *.orig |
688 $ rm *.orig |
688 $ hg fold |
|
689 abort: no revisions specified |
|
690 [255] |
|
691 $ hg fold --from |
|
692 abort: no revisions specified |
|
693 [255] |
|
694 $ hg fold . |
|
695 abort: must specify either --from or --exact |
|
696 [255] |
|
697 $ hg fold --from . --exact |
|
698 abort: cannot use both --from and --exact |
|
699 [255] |
|
700 $ hg fold --from . |
|
701 single revision specified, nothing to fold |
|
702 [1] |
|
703 $ hg fold 0::10 --rev 1 --exact |
|
704 abort: cannot fold non-linear revisions (multiple heads given) |
|
705 [255] |
|
706 $ hg fold -r 4 -r 6 --exact |
|
707 abort: cannot fold non-linear revisions (multiple roots given) |
|
708 [255] |
|
709 $ hg fold --from 10 1 |
|
710 abort: cannot fold non-linear revisions |
|
711 (given revisions are unrelated to parent of working directory) |
|
712 [255] |
|
713 $ hg fold --exact -r "4 and not 4" |
|
714 abort: specified revisions evaluate to an empty set |
|
715 (use different revision arguments) |
|
716 [255] |
|
717 $ hg phase --public 0 |
689 $ hg phase --public 0 |
718 $ hg fold --from -r 0 |
|
719 abort: cannot fold public revisions |
|
720 [255] |
|
721 $ hg fold --from -r 5 |
690 $ hg fold --from -r 5 |
722 3 changesets folded |
691 3 changesets folded |
723 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
692 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
724 $ hg fold --from 6 # want to run hg fold 6 |
|
725 abort: hidden revision '6'! |
|
726 (use --hidden to access hidden revisions; successor: af636757ce3b) |
|
727 [255] |
|
728 $ hg log -r 11 --template '{desc}\n' |
693 $ hg log -r 11 --template '{desc}\n' |
729 add 3 |
694 add 3 |
730 |
695 |
731 |
696 |
732 add 1 |
697 add 1 |
1361 o 18:edc3c9de504e@default(draft) a3 |
1326 o 18:edc3c9de504e@default(draft) a3 |
1362 | |
1327 | |
1363 ~ |
1328 ~ |
1364 |
1329 |
1365 Check that fold respects the allowunstable option |
1330 Check that fold respects the allowunstable option |
|
1331 |
|
1332 (most of this has been moved to test-fold.t) |
|
1333 |
1366 $ hg up edc3c9de504e |
1334 $ hg up edc3c9de504e |
1367 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1335 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1368 $ mkcommit unstableifparentisfolded |
1336 $ mkcommit unstableifparentisfolded |
1369 created new head |
1337 created new head |
1370 $ glog -r "18::" |
1338 $ glog -r "18::" |
1378 |/ |
1346 |/ |
1379 o 18:edc3c9de504e@default(draft) a3 |
1347 o 18:edc3c9de504e@default(draft) a3 |
1380 | |
1348 | |
1381 ~ |
1349 ~ |
1382 |
1350 |
1383 $ hg fold --exact "19 + 18" |
|
1384 abort: cannot fold chain not ending with a head or with branching |
|
1385 (new unstable changesets are not allowed) |
|
1386 [255] |
|
1387 $ hg fold --exact "18::29" |
|
1388 abort: cannot fold chain not ending with a head or with branching |
|
1389 (new unstable changesets are not allowed) |
|
1390 [255] |
|
1391 $ hg fold --exact "19::" |
1351 $ hg fold --exact "19::" |
1392 2 changesets folded |
1352 2 changesets folded |
1393 |
1353 |
1394 Check that evolve shows error while handling split commits |
1354 Check that evolve shows error while handling split commits |
1395 -------------------------------------- |
1355 -------------------------------------- |