Patchwork [1,of,4,mergedriver] test-copy-move-merge.t: explicitly request changed version

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

Comments

Siddharth Agarwal - Dec. 23, 2015, 8:53 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1450903280 28800
#      Wed Dec 23 12:41:20 2015 -0800
# Node ID 114b50a8240d205a94b3238d037a402793bb5d79
# Parent  3dea4eae4eebac11741f0c1dc5dcd9c88d8f4554
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 114b50a8240d
test-copy-move-merge.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-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -80,7 +80,9 @@  Test disabling copy tracing
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob)
   $ hg up -qC 2
-  $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
+  $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF
+  > c
+  > EOF
   rebasing 2:add3f11052fa "other" (tip)
   remote changed a which local deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c