view tests/test-inotify-issue1556.t @ 19111:6439d78e14fb stable

bookmarks: resolve divergent bookmark when moving across a branch

This patch resolves a single divergent bookmark if a divergent bookmark exists
in the target revision and it current bookmark is not an ancestor of the target
revision, else it would already be handled by the previous patch in this
series.

Test coverage is added.

  $ "$TESTDIR/hghave" inotify || exit 80
  $ hg init
  $ touch a b
  $ hg add a b
  $ rm b

status without inotify

  $ hg st
  A a
  ! b
  $ echo "[extensions]" >> $HGRCPATH
  $ echo "inotify=" >> $HGRCPATH

inserve

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

status

  $ hg st
  A a
  ! b
  ? hg.pid
  $ sleep 1

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

  $ "$TESTDIR/killdaemons.py" hg.pid