view tests/test-bad-pull.t @ 48454:51f521900473

update: add a test for `--merge` overriding the "abort" config

I don't see this behavior tested anywhere.

Differential Revision: https://phab.mercurial-scm.org/D11850

#require serve

  $ hg clone http://localhost:$HGPORT/ copy
  abort: * (glob)
  [100]

  $ test -d copy
  [1]

  $ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
  $ cat dumb.pid >> $DAEMON_PIDS
  $ hg clone http://localhost:$HGPORT/foo copy2
  abort: HTTP Error 404: * (glob)
  [100]
  $ killdaemons.py