Mercurial > hg
changeset 31729:c069c4e271e3
rebase: move destination test to new test file
We'll be adding a lot more tests here, so it makes sense to have this in its
own file now.
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Thu, 30 Mar 2017 03:50:10 -0700 |
| parents | 35eb8f112c88 |
| children | 6931c3346551 |
| files | tests/test-rebase-base.t tests/test-rebase-dest.t |
| diffstat | 2 files changed, 33 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-base.t Sat Apr 01 00:21:17 2017 -0400 +++ b/tests/test-rebase-base.t Thu Mar 30 03:50:10 2017 -0700 @@ -391,33 +391,3 @@ / o 0: A -Require a destination - $ cat >> $HGRCPATH <<EOF - > [commands] - > rebase.requiredest = True - > EOF - $ hg init repo - $ cd repo - $ echo a >> a - $ hg commit -qAm aa - $ echo b >> b - $ hg commit -qAm bb - $ hg up ".^" - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo c >> c - $ hg commit -qAm cc - $ hg rebase - abort: you must specify a destination - (use: hg rebase -d REV) - [255] - $ hg rebase -d 1 - rebasing 2:5db65b93a12b "cc" (tip) - saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) - $ hg rebase -d 0 -r . -q - $ HGPLAIN=1 hg rebase - rebasing 2:889b0bc6a730 "cc" (tip) - saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) - $ hg rebase -d 0 -r . -q - $ hg --config commands.rebase.requiredest=False rebase - rebasing 2:279de9495438 "cc" (tip) - saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rebase-dest.t Thu Mar 30 03:50:10 2017 -0700 @@ -0,0 +1,33 @@ +Require a destination + $ cat >> $HGRCPATH <<EOF + > [extensions] + > rebase = + > [commands] + > rebase.requiredest = True + > EOF + $ hg init repo + $ cd repo + $ echo a >> a + $ hg commit -qAm aa + $ echo b >> b + $ hg commit -qAm bb + $ hg up ".^" + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo c >> c + $ hg commit -qAm cc + $ hg rebase + abort: you must specify a destination + (use: hg rebase -d REV) + [255] + $ hg rebase -d 1 + rebasing 2:5db65b93a12b "cc" (tip) + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) + $ hg rebase -d 0 -r . -q + $ HGPLAIN=1 hg rebase + rebasing 2:889b0bc6a730 "cc" (tip) + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) + $ hg rebase -d 0 -r . -q + $ hg --config commands.rebase.requiredest=False rebase + rebasing 2:279de9495438 "cc" (tip) + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) +