Mercurial > hg-stable
changeset 16550:0d494a38c586 stable
test-rebase-parameters: more tests for revset/opts
- --source and revset
- --base and revset
- --rev and revset
- --rev and --source combination
- --rev and --base combination
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 29 Apr 2012 16:18:46 +0200 |
| parents | 517b25608ad6 |
| children | ebf6d38c9063 |
| files | tests/test-rebase-parameters.t |
| diffstat | 1 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Mon Apr 30 12:45:44 2012 +0200 +++ b/tests/test-rebase-parameters.t Sun Apr 29 16:18:46 2012 +0200 @@ -73,6 +73,13 @@ 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] + $ hg rebase nothing to rebase [1] @@ -186,7 +193,7 @@ $ hg clone -q -u . a a4 $ cd a4 - $ hg rebase --source 2 + $ hg rebase --source 'desc("C")' saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -246,7 +253,7 @@ $ hg clone -q -u . a a6 $ cd a6 - $ hg rebase --base 3 + $ hg rebase --base 'desc("D")' saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -330,6 +337,36 @@ $ 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