Mercurial > hg
comparison tests/test-merge-tools @ 7769:8c06d4bf2c23
test-merge-tools: Don't use tac
"tac" was a bad tool - is not available on all platforms.
The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 10 Feb 2009 16:11:48 +0100 |
| parents | 737f274d1915 |
| children | 660c8dd44060 |
comparison
equal
deleted
inserted
replaced
| 7768:5bf5fd1e2a74 | 7769:8c06d4bf2c23 |
|---|---|
| 90 | 90 |
| 91 echo | 91 echo |
| 92 echo Tool selection and merge-patterns | 92 echo Tool selection and merge-patterns |
| 93 echo | 93 echo |
| 94 | 94 |
| 95 echo "# merge-patterns specifies new tool tac:" | 95 echo "# merge-patterns specifies new tool false:" |
| 96 domerge -r 2 --config merge-patterns.f=tac | 96 domerge -r 2 --config merge-patterns.f=false |
| 97 | 97 |
| 98 echo "# merge-patterns specifies executable not found in PATH and gets warning:" | 98 echo "# merge-patterns specifies executable not found in PATH and gets warning:" |
| 99 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | 99 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
| 100 | 100 |
| 101 echo "# merge-patterns specifies executable with bogus path and gets warning:" | 101 echo "# merge-patterns specifies executable with bogus path and gets warning:" |