diff options
Diffstat (limited to 'tests/test-rebase-parameters.t')
| -rw-r--r-- | tests/test-rebase-parameters.t | 83 |
1 files changed, 21 insertions, 62 deletions
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t index 6597f75..98df15e 100644 --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -3,9 +3,6 @@ > graphlog= > rebase= > - > [phases] - > publish=False - > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF @@ -13,7 +10,7 @@ $ hg init a $ cd a - $ hg unbundle "$TESTDIR/bundles/rebase.hg" + $ hg unbundle $TESTDIR/bundles/rebase.hg adding changesets adding manifests adding file changes @@ -54,8 +51,8 @@ These fail: $ cd a1 $ hg rebase -s 8 -d 7 - nothing to rebase - [1] + abort: source is descendant of destination + [255] $ hg rebase --continue --abort abort: cannot use both abort and continue @@ -70,13 +67,6 @@ These fail: [255] $ hg rebase --base 5 --source 4 - abort: cannot specify both a source and a base - [255] - - $ hg rebase --rev 5 --source 4 - abort: cannot specify both a revision and a source - [255] - $ hg rebase --base 5 --rev 4 abort: cannot specify both a revision and a base [255] @@ -86,7 +76,7 @@ These fail: $ hg up -q 7 - $ hg rebase --traceback + $ hg rebase nothing to rebase [1] @@ -158,12 +148,12 @@ Rebase with base == '.' => same as no arguments (from 3 onto 8): $ cd .. -Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): +Rebase with dest == `hg branch` => same as no arguments (from 3 onto 8): $ hg clone -q -u 3 a a3 $ cd a3 - $ hg rebase --dest 'branch(.)' + $ hg rebase --dest `hg branch` saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -193,25 +183,25 @@ Specify only source (from 2 onto 8): $ hg clone -q -u . a a4 $ cd a4 - $ hg rebase --source 'desc("C")' + $ hg rebase --source 2 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 8: 'D' | - o 7: 'C' - | - o 6: 'I' - | - o 5: 'H' - | - | o 4: 'G' - |/| - o | 3: 'F' + o 7: 'C' + |\ + | o 6: 'I' | | - | o 2: 'E' - |/ - | o 1: 'B' + | o 5: 'H' + | | + | | o 4: 'G' + | |/| + | o | 3: 'F' + | | | + | | o 2: 'E' + | |/ + o | 1: 'B' |/ o 0: 'A' @@ -253,7 +243,7 @@ Specify only base (from 1 onto 8): $ hg clone -q -u . a a6 $ cd a6 - $ hg rebase --base 'desc("D")' + $ hg rebase --base 3 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -283,7 +273,7 @@ Specify source and dest (from 2 onto 7): $ hg clone -q -u . a a7 $ cd a7 - $ hg rebase --source 2 --dest 7 + $ hg rebase --detach --source 2 --dest 7 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -337,36 +327,6 @@ Specify base and dest (from 1 onto 7): $ cd .. - -Specify only revs (from 2 onto 8) - - $ hg clone -q -u . a a9 - $ cd a9 - - $ hg rebase --rev 'desc("C")::' - saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob) - - $ hg tglog - @ 8: 'D' - | - o 7: 'C' - | - o 6: 'I' - | - o 5: 'H' - | - | o 4: 'G' - |/| - o | 3: 'F' - | | - | o 2: 'E' - |/ - | o 1: 'B' - |/ - o 0: 'A' - - $ cd .. - Test --tool parameter: $ hg init b @@ -427,4 +387,3 @@ Test --tool parameter: tool option will be ignored saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) - $ cd .. |