view tests/test-bad-pull.t @ 31166:fad5e299cfc7

update: accept --merge to allow merging across topo branches (issue5125)

#require serve killdaemons

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

  $ 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)
  [255]
  $ killdaemons.py