[PATCH 5 of 6] rebase: demonstrate behavior with requiredest and pull --rebase

Ryan McElroy rm at fb.com
Tue Mar 28 17:31:14 EDT 2017


# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1490735116 25200
#      Tue Mar 28 14:05:16 2017 -0700
# Node ID cdf33d63e89377abd6f48ba6d4548a3b3f4af3e2
# Parent  ac6634fab80b59ba48958ca03289c4434e9483c4
rebase: demonstrate behavior with requiredest and pull --rebase

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]
+


More information about the Mercurial-devel mailing list