Mercurial > hg
view tests/test-up-issue1456 @ 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 | a679bd371091 |
children | f331de880cbb |
line wrap: on
line source
#!/bin/sh rm -rf a hg init a cd a echo foo > foo hg ci -qAm0 chmod +x foo hg ci -m1 hg co -q 0 echo dirty > foo sleep 1 hg up -q cat foo hg st -A echo '% validate update of standalone execute bit change' hg up -C 0 chmod -x foo hg ci -m removeexec hg up -C 0 hg up hg st