Mercurial > hg
view tests/test-inotify-issue1542.t @ 17422:93bc65e970c0 stable
mergetools.hgrc: set vimdiff to check=changed
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.
This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 02 Aug 2012 13:51:49 +0200 |
parents | 92b2c876a79d |
children | f7c4eb60b0c3 |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a $ mkdir dir $ touch dir/b $ touch dir/c $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH $ hg add dir/c inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" $ hg st A dir/c ? a ? dir/b ? hg.pid moving dir out $ mv dir ../tmp-test-inotify-issue1542 status $ hg st ! dir/c ? a ? hg.pid $ sleep 1 Are we able to kill the service? if not, the service died on some error $ kill `cat hg.pid`