Mercurial > hg
view tests/test-inotify-issue1208 @ 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 | 9c4e488f105e |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" inotify || exit 80 echo "[extensions]" >> $HGRCPATH echo "inotify=" >> $HGRCPATH p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" hg init $p cd $p echo % fail ln -sf doesnotexist .hg/inotify.sock hg st hg inserve rm .hg/inotify.sock echo % inserve hg inserve -d --pid-file=hg.pid cat hg.pid >> "$DAEMON_PIDS" echo % status hg status kill `cat hg.pid`