1 #!/bin/bash

     2 

     3 export HGMERGE=true

     4 

     5 set -ex

     6 mkdir r1

     7 cd r1

     8 hg init

     9 echo a > a

    10 hg addremove

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

    12 

    13 cd ..

    14 mkdir r2

    15 cd r2

    16 hg init ../r1

    17 hg up

    18 echo abc > a

    19 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"

    20 

    21 cd ../r1

    22 echo b > b

    23 echo a2 > a

    24 hg addremove

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

    26 

    27 cd ../r2

    28 hg -q pull ../r1

    29 hg status

    30 hg -d up

    31 hg -d up -m

    32 hg parents

    33 hg -v history

    34 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"

    35