# HG changeset patch # User Nicolas Dumazet # Date 2011-04-30 15:38:06 # Node ID 7d1b637738a36e3ca0937e9c0956e6140d6661ea # Parent e83567686d660ee59f7b07399cd6bce12bf45354 tests: move testcase from rebase-named-branches to rebase-parameters It saves us a clone of a repository. diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t --- a/tests/test-rebase-named-branches.t +++ b/tests/test-rebase-named-branches.t @@ -83,40 +83,3 @@ Rebasing descendant onto ancestor across 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 .. - diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -50,6 +50,10 @@ These fail: $ 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]