[PATCH 2 of 6] rebase: test to show brokenness with requiredest
Ryan McElroy
rm at fb.com
Tue Mar 28 17:31:11 EDT 2017
# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1490734179 25200
# Tue Mar 28 13:49:39 2017 -0700
# Node ID 976b28021f29ad7686ea57fb0fdff4bd17798a71
# Parent a10ea0843904718f724cfb1bd3c3db143c794921
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.
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
@@ -31,3 +31,30 @@ Require a destination
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]
More information about the Mercurial-devel
mailing list