Mercurial > hg
view tests/test-inotify-issue1542.t @ 18337:557c8522aec0
tests: better test coverage of merges of flags
This makes existing problems with merges of symlinks and files more obvious and
add test coverage for tricky merges without real common ancestors.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Jan 2013 01:05:12 +0100 |
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`