Mercurial > hg
view tests/test-verify @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | 69aeaaaf6e07 |
children | baaa832fd253 |
line wrap: on
line source
#!/bin/sh echo % prepare repo hg init echo "some text" > FOO.txt echo "another text" > bar.txt echo "more text" > QUICK.txt hg add hg ci -d '0 0' -mtest1 echo echo % verify hg verify echo echo % introduce some bugs in repo cd .hg/store/data mv _f_o_o.txt.i X_f_o_o.txt.i mv bar.txt.i xbar.txt.i rm _q_u_i_c_k.txt.i echo echo % verify hg verify exit 0