tests/test-bad-pull.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 09 Feb 2017 09:32:25 -0800
changeset 30927 4d019d0e1b3b
parent 29514 280528245ecf
child 32958 75be14993fda
permissions -rw-r--r--
merge: print status message before launching external merge tool It seems somewhat common that people run into a merge conflict and don't notice the launched merge tool, and instead they think hg just hung. Let's print a message for each file that we launch a GUI merge tool for.

#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