Patchwork [2,of,4,mergedriver] test-commit-amend.t: explicitly request changed version in c/d conflict

login
register
mail settings
Submitter Siddharth Agarwal
Date Dec. 23, 2015, 8:54 p.m.
Message ID <6eabc52f369ea9878d54.1450904040@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/12319/
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 6eabc52f369ea9878d54a9a8ac9c3ebf3691e2bb
# Parent  114b50a8240d205a94b3238d037a402793bb5d79
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 6eabc52f369e
test-commit-amend.t: explicitly request changed version in c/d conflict

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-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -810,7 +810,9 @@  Amend a merge changeset (with manifest-l
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
-  $ hg merge -q bar
+  $ hg merge -q bar --config ui.interactive=True << EOF
+  > c
+  > EOF
   local changed aa which remote deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
   $ hg ci -m 'merge bar (with conflicts)'