Patchwork [4,of,5] test-merge-remove.t: unset HGMERGE

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 12, 2015, 10:29 p.m.
Message ID <bf354f5a168277cf493f.1447367373@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11384/
State Changes Requested
Delegated to: Augie Fackler
Headers show

Comments

Siddharth Agarwal - Nov. 12, 2015, 10:29 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447364566 28800
#      Thu Nov 12 13:42:46 2015 -0800
# Node ID bf354f5a168277cf493fc7c95d74d91c6d23447f
# Parent  c15fb9dde5792055895b9d629dba04424f89b758
test-merge-remove.t: unset HGMERGE

For upcoming improvements to change/delete conflict behavior, we want to make
sure that we don't get into the short-circuit HGMERGE logic, and that the
default merge tool (':merge') continues to be invoked except when a prompt is
required.

Patch

diff --git a/tests/test-merge-remove.t b/tests/test-merge-remove.t
--- a/tests/test-merge-remove.t
+++ b/tests/test-merge-remove.t
@@ -1,3 +1,4 @@ 
+  $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
   $ hg init
 
   $ echo foo > foo