1 #!/bin/sh

     2 # FIXME: This test may fail due to an uncritical bug in Mercurial.

     3 

     4 mkdir t

     5 cd t

     6 hg init

     7 echo "added file1" > file1

     8 echo "added file2" > file2

     9 hg add file1 file2

    10 hg commit -m "added file1 and file2" -d "0 0" -u user

    11 echo "changed file1" >> file1

    12 hg commit -m "changed file1" -d "0 0" -u user

    13 hg -q log

    14 hg id

    15 hg update -C 0

    16 hg id

    17 echo "changed file1" >> file1

    18 hg id

    19 hg revert

    20 hg diff

    21 hg status

    22 hg id

    23 hg update

    24 hg diff

    25 hg status

    26 hg id

    27 hg update -C 0

    28 echo "changed file1 different" >> file1

    29 HGMERGE=merge hg update

    30 hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"

    31 hg status

    32 hg id

    33 hg revert

    34 hg diff

    35 hg status

    36 hg id

    37 hg revert -r tip

    38 hg diff

    39 hg status

    40 hg id

    41 hg update -C

    42 hg diff

    43 hg status

    44 hg id

    45 cd ..; /bin/rm -rf t

    46