Mercurial > hg
changeset 31732:9ddf875183b0
rebase: demonstrate behavior with requiredest and pull --rebase
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Thu, 30 Mar 2017 03:50:10 -0700 |
| parents | b5afec71c1f9 |
| children | ae6bab095c66 |
| files | tests/test-rebase-dest.t |
| diffstat | 1 files changed, 25 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 @@ -57,3 +57,28 @@ $ hg rebase --continue rebasing 3:0537f6b50def "dc" (tip) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob) + + $ cd .. + +Check rebase.requiredest interaction with pull --rebase + $ hg clone repo clone + updating to branch default + 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd repo + $ echo e > e + $ hg commit -qAm ee + $ cd .. + $ cd clone + $ echo f > f + $ hg commit -qAm ff + $ hg pull --rebase + pulling from $TESTTMP/repo + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 2 changes to 2 files (+1 heads) + abort: you must specify a destination + (use: hg rebase -d REV) + [255] +