Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: explicitly request changed version in test-rebase-newancestor.t
authorSiddharth Agarwal <sid0@fb.com>
Wed, 23 Dec 2015 12:41:20 -0800
changeset 27598 97e39f70fb47
parent 27597 fe150586d9bd
child 27599 ad5966de3c9a
tests: explicitly request changed version in test-rebase-newancestor.t 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.
tests/test-rebase-newancestor.t file | annotate | diff | comparison | revisions 
--- a/tests/test-rebase-newancestor.t	Wed Dec 23 12:41:20 2015 -0800
+++ b/tests/test-rebase-newancestor.t	Wed Dec 23 12:41:20 2015 -0800
@@ -128,7 +128,9 @@
 
 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 @@
   $ 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
mercurial