view tests/test-inotify-debuginotify.t @ 16001:fcf66193b186 stable

merge: defer symlink flag merging to filemerge (issue3200)

Previously, we could change a normal file into a corrupt symlink when
trying to merge a symlink flag. Now, we leave the flag alone and let
filemerge deal with it (usually by a prompt).

We also drop a redundant flag setting after filemerge (now dealt with
by ms.resolve) that would cause similar corruption.

  $ "$TESTDIR/hghave" inotify || exit 80
  $ hg init
  $ echo "[extensions]" >> $HGRCPATH
  $ echo "inotify=" >> $HGRCPATH

inserve

  $ hg inserve -d --pid-file=hg.pid
  $ cat hg.pid >> "$DAEMON_PIDS"

let the daemon finish its stuff

  $ sleep 1

empty

  $ hg debuginotify
  directories being watched:
    /
    .hg/
  $ mkdir a
  $ sleep 1

only 'a

  $ hg debuginotify
  directories being watched:
    /
    .hg/
    a/
  $ rmdir a
  $ sleep 1

empty again

  $ hg debuginotify
  directories being watched:
    /
    .hg/
  $ kill `cat hg.pid`