Patchwork [3,of,8] test: use the "correct" merge tool in `test-rebase-detach.t`

login
register
mail settings
Submitter Boris Feld
Date Nov. 2, 2018, 9:31 a.m.
Message ID <9de8e01ffb96120d41a4.1541151113@localhost.localdomain>
Download mbox | patch
Permalink /patch/36326/
State Accepted
Headers show

Comments

Boris Feld - Nov. 2, 2018, 9:31 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1541078674 -3600
#      Thu Nov 01 14:24:34 2018 +0100
# Node ID 9de8e01ffb96120d41a48f0ca8748ed3a77a75b7
# Parent  1f02b29ed5c6637cfa8e844f1b7019f3d90af107
# EXP-Topic run-tests
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 9de8e01ffb96
test: use the "correct" merge tool in `test-rebase-detach.t`

The value of `HGMERGE` overrides the value passed through --config. We are
about to drop this `HGMERGE` environment variable so we update the value used
in config to match what is currently in use.

This is another example of confusion introduced by the `HGMERGE` environment
variable.

Patch

diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -293,7 +293,7 @@  Ensure --continue restores a correct sta
   $ hg ci -A -m 'B2'
   adding B
   $ hg phase --force --secret .
-  $ hg rebase -s . -d B --config ui.merge=internal:fail
+  $ hg rebase -s . -d B --config ui.merge=internal:merge
   rebasing 3:17b4880d2402 "B2" (tip)
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')