Patchwork [3,of,4,mergedriver] test-rebase-newancestor.t: explicitly request changed version

login
register
mail settings
Submitter Siddharth Agarwal
Date Dec. 23, 2015, 8:54 p.m.
Message ID <1a9f3945bca494f92ae7.1450904041@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/12321/
State Accepted
Delegated to: Augie Fackler
Headers show

Comments

Siddharth Agarwal - Dec. 23, 2015, 8:54 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1450903280 28800
#      Wed Dec 23 12:41:20 2015 -0800
# Node ID 1a9f3945bca494f92ae7e94bf5d6becf519e0c69
# Parent  6eabc52f369ea9878d54a9a8ac9c3ebf3691e2bb
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 1a9f3945bca4
test-rebase-newancestor.t: explicitly request changed version

We're going to change the default for this in an upcoming patch, but in this
instance we do want to continue picking the changed version.

Patch

diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -128,7 +128,9 @@  wrong.
 
 Full rebase all the way back from branching point:
 
-  $ hg rebase -r 'only(dev,default)' -d default
+  $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF
+  > c
+  > EOF
   rebasing 1:1d1a643d390e "dev: create branch"
   note: rebase of 1:1d1a643d390e created no changes to commit
   rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
@@ -157,7 +159,9 @@  Grafty cherry picking rebasing:
   $ cd ../ancestor-merge-2
 
   $ hg phase -fdr0:
-  $ hg rebase -r 'children(only(dev,default))' -d default
+  $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF
+  > c
+  > EOF
   rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
   rebasing 4:4b019212aaf6 "dev: merge default"
   remote changed f-default which local deleted