Patchwork [3,of,5] test-commit-amend.t: unset HGMERGE

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 12, 2015, 10:29 p.m.
Message ID <c15fb9dde5792055895b.1447367372@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11387/
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 1447364439 28800
#      Thu Nov 12 13:40:39 2015 -0800
# Node ID c15fb9dde5792055895b9d629dba04424f89b758
# Parent  34326e0cf6435e87149adecc8e74039ac403fe75
test-commit-amend.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-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -3,6 +3,7 @@ 
   > usegeneraldelta=yes
   > EOF
 
+  $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
   $ hg init
 
 Setup: