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/bash

     2

     3

set -x

     4

mkdir t

     5

cd t

     6

hg init

     7

echo a > a

     8

hg add a

     9

hg commit -t "test" -u test -d "0 0"

    10

hg verify

    11

hg parents

    12

hg status

    13

hg undo

    14

hg verify

    15

hg parents

    16

hg status