view tests/test-inotify-lookup.t @ 18605:bcf29565d89f

manifestmerge: pass in branchmerge and force separately

This will be used in an upcoming patch.

  $ "$TESTDIR/hghave" inotify || exit 80
  $ hg init
  $ echo "[extensions]" > .hg/hgrc
  $ echo "inotify=" >> .hg/hgrc
  $ hg inserve -d --pid-file .hg/inotify.pid
  $ echo a > a
  $ hg ci -Aqm0
  $ hg co -q null
  $ hg co -q
  $ hg st
  $ cat a
  a
  $ "$TESTDIR/killdaemons.py" .hg/inotify.pid