Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----

     1

#!/bin/sh -x

     2

hg init

     3

echo This is file a1 > a

     4

hg add a

     5

hg commit -t "commit #0" -d "0 0" -u user

     6

ls

     7

echo This is file b1 > b

     8

hg add b

     9

hg commit -t "commit #1" -d "0 0" -u user

    10

hg co 0

    11

# B should disappear

    12

ls