1 #!/bin/sh

     2 

     3 echo "[extensions]" >> $HGRCPATH

     4 echo "graphlog=" >> $HGRCPATH

     5 

     6 function addcommit {

     7     echo $1 > $1

     8     hg add $1

     9     hg commit -d "${2} 0" -u test -m $1

    10 }

    11 function commit {

    12     hg commit -d "${2} 0" -u test -m $1

    13 }

    14 

    15 hg init a

    16 cd a

    17 addcommit "A" 0

    18 addcommit "B" 1

    19 echo "C" >> A

    20 commit "C" 2

    21 

    22 hg update -C 0

    23 echo "D" >> A

    24 commit "D" 3

    25 

    26 echo

    27 echo "% Merging a conflict araises"

    28 hg merge

    29 

    30 echo

    31 echo "% Correct the conflict without marking the file as resolved"

    32 echo "ABCD" > A

    33 hg commit -m "Merged"

    34 

    35 echo

    36 echo "% Mark the conflict as resolved and commit"

    37 hg resolve -m A

    38 hg commit -m "Merged"

    39 

    40 exit 0