Patchwork [2,of,5,v2] rebase: test to show brokenness with requiredest

login
register
mail settings
Submitter Ryan McElroy
Date March 30, 2017, 10:50 a.m.
Message ID <8f154b4f7255427303ae.1490871034@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/19843/
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 8f154b4f7255427303aed7fff2d78ff84e49bfeb
# Parent  9f25299c45b39fbdfc34c0c3ef1c454bcd42ed02
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.

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]