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

hg id

     8

echo a > a

     9

hg add a

    10

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

    11

hg co

    12

hg identify

    13

T=`hg -q tip | cut -d : -f 2`

    14

echo "$T first" > .hgtags

    15

cat .hgtags

    16

hg add .hgtags

    17

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

    18

hg tags

    19

hg identify

    20

echo bb > a

    21

hg status

    22

hg identify

    23

hg co first

    24

hg id

    25

hg -v id

    26

hg status

    27

echo 1 > b

    28

hg add b

    29

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

    30

hg id

    31

hg co -m 1

    32

hg id

    33

hg status

    34