--- a/tests/test-evolve.t Sun Jul 23 06:25:30 2017 +0200
+++ b/tests/test-evolve.t Sun Jul 23 16:39:21 2017 +0200
@@ -683,48 +683,13 @@
Test fold
+(most of the testing have been moved to test-fold
$ rm *.orig
- $ hg fold
- abort: no revisions specified
- [255]
- $ hg fold --from
- abort: no revisions specified
- [255]
- $ hg fold .
- abort: must specify either --from or --exact
- [255]
- $ hg fold --from . --exact
- abort: cannot use both --from and --exact
- [255]
- $ hg fold --from .
- single revision specified, nothing to fold
- [1]
- $ hg fold 0::10 --rev 1 --exact
- abort: cannot fold non-linear revisions (multiple heads given)
- [255]
- $ hg fold -r 4 -r 6 --exact
- abort: cannot fold non-linear revisions (multiple roots given)
- [255]
- $ hg fold --from 10 1
- abort: cannot fold non-linear revisions
- (given revisions are unrelated to parent of working directory)
- [255]
- $ hg fold --exact -r "4 and not 4"
- abort: specified revisions evaluate to an empty set
- (use different revision arguments)
- [255]
$ hg phase --public 0
- $ hg fold --from -r 0
- abort: cannot fold public revisions
- [255]
$ hg fold --from -r 5
3 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg fold --from 6 # want to run hg fold 6
- abort: hidden revision '6'!
- (use --hidden to access hidden revisions; successor: af636757ce3b)
- [255]
$ hg log -r 11 --template '{desc}\n'
add 3
@@ -1363,6 +1328,9 @@
~
Check that fold respects the allowunstable option
+
+(most of this has been moved to test-fold.t)
+
$ hg up edc3c9de504e
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit unstableifparentisfolded
@@ -1380,14 +1348,6 @@
|
~
- $ hg fold --exact "19 + 18"
- abort: cannot fold chain not ending with a head or with branching
- (new unstable changesets are not allowed)
- [255]
- $ hg fold --exact "18::29"
- abort: cannot fold chain not ending with a head or with branching
- (new unstable changesets are not allowed)
- [255]
$ hg fold --exact "19::"
2 changesets folded