Mercurial > hg
diff tests/test-rebase-mq-skip.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 | 4edd427f34c1 |
| children | dc5e5577af39 |
line wrap: on
line diff
--- a/tests/test-rebase-mq-skip.t Mon Jul 15 22:23:31 2019 +0530 +++ b/tests/test-rebase-mq-skip.t Tue Jul 16 01:59:28 2019 +0530 @@ -1,3 +1,4 @@ +#testcases continuecommand continueflag This emulates the effects of an hg pull --rebase in which the remote repo already has one local mq patch @@ -13,6 +14,12 @@ > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" > EOF +#if continueflag + $ cat >> $HGRCPATH <<EOF + > [alias] + > continue = rebase --continue + > EOF +#endif $ hg init a $ cd a @@ -155,7 +162,7 @@ (no more unresolved files) continue: hg rebase --continue - $ hg rebase --continue + $ hg continue already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a