Mercurial > hg-stable
changeset 31735:6931c3346551
rebase: test to show brokenness with requiredest
As shown in issue5513, --continue is broken when destination is required. This
adds a patch that demonstates this silly behavior, which will be fixed in a
future patch.
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Thu, 30 Mar 2017 03:50:10 -0700 |
| parents | c069c4e271e3 |
| children | b5afec71c1f9 |
| files | tests/test-rebase-dest.t |
| diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-dest.t Thu Mar 30 03:50:10 2017 -0700 +++ b/tests/test-rebase-dest.t Thu Mar 30 03:50:10 2017 -0700 @@ -31,3 +31,30 @@ rebasing 2:279de9495438 "cc" (tip) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) +Requiring dest should not break continue or other rebase options + $ hg up 1 -q + $ echo d >> c + $ hg commit -qAm dc + $ hg log -G -T '{rev} {desc}' + @ 3 dc + | + | o 2 cc + |/ + o 1 bb + | + o 0 aa + + $ hg rebase -d 2 + rebasing 3:0537f6b50def "dc" (tip) + merging c + warning: conflicts while merging c! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] + $ echo d > c + $ hg resolve --mark --all + (no more unresolved files) + continue: hg rebase --continue + $ hg rebase --continue + abort: you must specify a destination + (use: hg rebase -d REV) + [255]