view tests/test-inotify-issue1371.t @ 14485:610873cf064a

Make pull -u behave like pull && update

Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.

Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"

since it can no longer assume the user is running hg update.

  $ "$TESTDIR/hghave" inotify || exit 80
  $ hg init 
  $ touch a b c d e f
  $ echo "[extensions]" >> $HGRCPATH
  $ echo "inotify=" >> $HGRCPATH

inserve

  $ hg inserve -d --pid-file=hg.pid 2>&1
  $ cat hg.pid >> "$DAEMON_PIDS"
  $ hg ci -Am m
  adding a
  adding b
  adding c
  adding d
  adding e
  adding f
  adding hg.pid

let the daemon finish its stuff

  $ sleep 1

eed to test all file opperations

  $ hg rm a
  $ rm b
  $ echo c >> c
  $ touch g
  $ hg add g
  $ hg mv e h
  $ hg status
  M c
  A g
  A h
  R a
  R e
  ! b
  $ sleep 1

Are we able to kill the service? if not, the service died on some error

  $ kill `cat hg.pid`