view tests/test-hup.t @ 12765:5eed9ceebd64

merge: when --tool is specified, disable HGMERGE by setting to empty string

HGMERGE has different semantics than ui.merge.  HGMERGE should hold the name
on an executable in your path, or an absolute tool path.  As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE.  Instead,
we disable HGMERGE by setting it to an empty string.

Test hangup signal in the middle of transaction

  $ "$TESTDIR/hghave" 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.branch .hg/journal.desc .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a