Mercurial > hg-stable
changeset 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 | 5bf5fd1e2a74 |
| children | fd3e5ff53a31 |
| files | tests/test-merge-tools tests/test-merge-tools.out |
| diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-tools Sun Feb 15 10:50:48 2009 -0600 +++ b/tests/test-merge-tools Tue Feb 10 16:11:48 2009 +0100 @@ -92,8 +92,8 @@ echo Tool selection and merge-patterns echo -echo "# merge-patterns specifies new tool tac:" -domerge -r 2 --config merge-patterns.f=tac +echo "# merge-patterns specifies new tool false:" +domerge -r 2 --config merge-patterns.f=false echo "# merge-patterns specifies executable not found in PATH and gets warning:" domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
--- a/tests/test-merge-tools.out Sun Feb 15 10:50:48 2009 -0600 +++ b/tests/test-merge-tools.out Tue Feb 10 16:11:48 2009 +0100 @@ -175,27 +175,23 @@ Tool selection and merge-patterns -# merge-patterns specifies new tool tac: +# merge-patterns specifies new tool false: [merge-tools] false.whatever= true.priority=1 true.executable=cat # hg update -C 1 -# hg merge -r 2 --config merge-patterns.f=tac -space -revision 1 -space -revision 0 -space -revision 2 +# hg merge -r 2 --config merge-patterns.f=false merging f -0 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) +merging f failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges # cat f revision 1 space # hg stat M f +? f.orig # merge-patterns specifies executable not found in PATH and gets warning: [merge-tools]