Mercurial > hg > mercurial-crew

comparison tests/test-merge-tools @ 10282:08a0f04b56bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many, many trivial check-code fixups
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jan 2010 00:05:27 -0600
parents 94319ae527cf
children c52057614c72
comparison
equal deleted inserted replaced
10281:e7d3b509af8b 10282:08a0f04b56bd
81 81
82 echo "# or true.executable not found in PATH:" 82 echo "# or true.executable not found in PATH:"
83 domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool 83 domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool
84 84
85 echo "# or true.executable with bogus path:" 85 echo "# or true.executable with bogus path:"
86 domerge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool 86 domerge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool
87 87
88 echo "# but true.executable set to cat found in PATH works:" 88 echo "# but true.executable set to cat found in PATH works:"
89 echo "true.executable=cat" >> .hg/hgrc 89 echo "true.executable=cat" >> .hg/hgrc
90 domerge -r 2 90 domerge -r 2
91 91
101 101
102 echo "# merge-patterns specifies executable not found in PATH and gets warning:" 102 echo "# merge-patterns specifies executable not found in PATH and gets warning:"
103 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool 103 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
104 104
105 echo "# merge-patterns specifies executable with bogus path and gets warning:" 105 echo "# merge-patterns specifies executable with bogus path and gets warning:"
106 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool 106 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool
107 107
108 echo 108 echo
109 echo ui.merge overrules priority 109 echo ui.merge overrules priority
110 echo 110 echo
111 111