Mercurial > hg
changeset 14123:7d1b637738a3
tests: move testcase from rebase-named-branches to rebase-parameters
It saves us a clone of a repository.
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sat, 30 Apr 2011 17:38:06 +0200 |
| parents | e83567686d66 |
| children | 81ecc951f57b |
| files | tests/test-rebase-named-branches.t tests/test-rebase-parameters.t |
| diffstat | 2 files changed, 4 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-named-branches.t Sat Apr 30 17:38:06 2011 +0200 +++ b/tests/test-rebase-named-branches.t Sat Apr 30 17:38:06 2011 +0200 @@ -83,40 +83,3 @@ o 0: 'A' $ cd .. - -Rebasing descendant onto ancestor across the same named branches - - $ hg clone -q -u . a a2 - - $ cd a2 - - $ echo I > I - - $ hg ci -AmI - adding I - - $ hg tglog - @ 8: 'I' - | - o 7: 'H' - | - | o 6: 'G' - |/| - o | 5: 'F' - | | - | o 4: 'E' - |/ - | o 3: 'D' - | | - | o 2: 'C' - | | - | o 1: 'B' - |/ - o 0: 'A' - - $ hg rebase -s 8 -d 7 - abort: source is descendant of destination - [255] - - $ cd .. -
--- a/tests/test-rebase-parameters.t Sat Apr 30 17:38:06 2011 +0200 +++ b/tests/test-rebase-parameters.t Sat Apr 30 17:38:06 2011 +0200 @@ -50,6 +50,10 @@ $ hg clone -q -u . a a1 $ cd a1 + $ hg rebase -s 8 -d 7 + abort: source is descendant of destination + [255] + $ hg rebase --continue --abort abort: cannot use both abort and continue [255]