Patchwork [4,of,5,v2] rebase: demonstrate behavior with requiredest and pull --rebase

login
register
mail settings
Submitter Ryan McElroy
Date March 30, 2017, 10:50 a.m.
Message ID <2b8f2a54323459455a10.1490871036@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/19845/
State Accepted
Headers show

Comments

Ryan McElroy - March 30, 2017, 10:50 a.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1490871010 25200
#      Thu Mar 30 03:50:10 2017 -0700
# Node ID 2b8f2a54323459455a1038ca3b5a98a03cf4fe0e
# Parent  50219901327938be2f4d6df041b69d7498a7914d
rebase: demonstrate behavior with requiredest and pull --rebase

Patch

diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -57,3 +57,28 @@  Requiring dest should not break continue
   $ 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]
+