view tests/test-hup.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.

Test hangup signal in the middle of transaction

  $ "$TESTDIR/hghave" serve fifo || exit 80
  $ hg init
  $ mkfifo p
  $ hg serve --stdio < p &
  $ P=$!
  $ (echo lock; echo addchangegroup; sleep 5) > p &
  $ Q=$!
  $ sleep 3
  0
  0
  adding changesets
  $ kill -HUP $P
  $ wait
  transaction abort!
  rollback completed
  killed!
  $ echo .hg/* .hg/store/*
  .hg/00changelog.i .hg/journal.bookmarks .hg/journal.branch .hg/journal.desc .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a .hg/store/journal.phaseroots