Patchwork [1,of,2] test-merge-prompt.t: unset HGMERGE

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 10, 2015, 8:48 a.m.
Message ID <5a25f53a58a973404e4d.1447145337@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11344/
State Accepted
Commit fc41f9ffd4a4dd2268bad644e92fb2dc1fa15f40
Headers show

Comments

Siddharth Agarwal - Nov. 10, 2015, 8:48 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447137452 28800
#      Mon Nov 09 22:37:32 2015 -0800
# Node ID 5a25f53a58a973404e4de43e0221d076f8c07e27
# Parent  cfb9e3094e5c032b74e6372c9a34264a10d2cbdd
test-merge-prompt.t: unset HGMERGE

We're going to test behavior with and without HGMERGE, so disable it for the
test.

Patch

diff --git a/tests/test-merge-prompt.t b/tests/test-merge-prompt.t
--- a/tests/test-merge-prompt.t
+++ b/tests/test-merge-prompt.t
@@ -5,6 +5,9 @@  b5605d88dc27: Make ui.prompt repeat on "
 840e2b315c1f: Fix misleading error and prompts during update/merge
  (issue556)
 
+Make sure HGMERGE doesn't interfere with the test
+  $ unset HGMERGE
+
   $ status() {
   >     echo "--- status ---"
   >     hg st -A file1 file2