Mercurial > hg
diff tests/test-rebase-abort.t @ 42613:35ebdbb38efb
continue: added support for rebase
This adds support of rebase to hg continue plan.
An independent continue logic for rebase is created
under continuerebase() function. For this a seperate
rebaseruntime object is created under the function to
handle an interrupted rebasestate.
Results of tests are shown.
Differential Revision: https://phab.mercurial-scm.org/D6646
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Tue, 16 Jul 2019 01:59:28 +0530 |
parents | b9bc47211cf5 |
children | 9c9cfecd4600 |
line wrap: on
line diff
--- a/tests/test-rebase-abort.t Mon Jul 15 22:23:31 2019 +0530 +++ b/tests/test-rebase-abort.t Tue Jul 16 01:59:28 2019 +0530 @@ -1,4 +1,5 @@ #testcases abortcommand abortflag +#testcases continuecommand continueflag $ cat >> $HGRCPATH <<EOF > [extensions] @@ -18,6 +19,13 @@ > EOF #endif +#if continueflag + $ cat >> $HGRCPATH <<EOF + > [alias] + > continue = rebase --continue + > EOF +#endif + $ hg init a $ cd a @@ -162,7 +170,7 @@ $ hg --config extensions.mq= strip --quiet "destination()" $ mv .hg/rebasestate.back .hg/rebasestate - $ hg rebase --continue + $ hg continue abort: cannot continue inconsistent rebase (use "hg rebase --abort" to clear broken state) [255]