[PATCH 2 of 4 mergedriver] test-commit-amend.t: explicitly request changed version in c/d conflict
Siddharth Agarwal
sid0 at fb.com
Wed Dec 23 14:54:00 CST 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at 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.
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)'
More information about the Mercurial-devel
mailing list