view tests/test-bad-pull.t @ 46813:316a768f2e43

test-copies: add a test updating file content while salvaging it

A deleted file is brought back during a merge. Its content is changed in the
same go.

This reveal some issue with the upgrade code.

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

#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