Patchwork D3974: tests: demonstrate that no requested merge tool is ignored if missing

login
register
mail settings
Submitter phabricator
Date Aug. 8, 2018, 12:10 p.m.
Message ID <f7af44c24f781af462e883faec56191c@localhost.localdomain>
Download mbox | patch
Permalink /patch/33418/
State Not Applicable
Headers show

Comments

phabricator - Aug. 8, 2018, 12:10 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6bfd1054d867: tests: demonstrate that no requested merge tool is ignored if missing (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3974?vs=9648&id=10070

REVISION DETAIL
  https://phab.mercurial-scm.org/D3974

AFFECTED FILES
  tests/test-merge-tools.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1737,6 +1737,27 @@ 
   # hg resolve --list
   U f
 
+missingbinary is a merge-tool that doesn't exist:
+
+  $ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc
+  $ beforemerge
+  [merge-tools]
+  false.whatever=
+  true.priority=1
+  true.executable=cat
+  missingbinary.executable=doesnotexist
+  # hg update -C 1
+  $ hg merge -y -r 2 --config ui.merge=missingbinary
+  merging f
+  revision 1
+  space
+  revision 0
+  space
+  revision 2
+  space
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+
 #if symlink
 
 internal merge cannot handle symlinks and shouldn't try:
@@ -1790,6 +1811,7 @@ 
   false.whatever=
   true.priority=1
   true.executable=cat
+  missingbinary.executable=doesnotexist
   # hg update -C 1
 
 (default behavior: checking files in the working parent context)