tests/test-exchange-A2.t
changeset 829 0943f327e2fb
parent 828 c362513b3c7e
child 830 f3b3a09ba312
equal deleted inserted replaced
828:c362513b3c7e 829:0943f327e2fb
     1 
     1 
     2 
     2 
     3 Initial setup
     3 Initial setup
     4 
     4 
     5   $ cat >> $HGRCPATH <<EOF
     5   $ . $TESTDIR/_exc-util.sh
     6   > [web]
       
     7   > push_ssl = false
       
     8   > allow_push = *
       
     9   > [ui]
       
    10   > logtemplate ="{node|short} ({phase}): {desc}\n"
       
    11   > [phases]
       
    12   > publish=False
       
    13   > [extensions]
       
    14   > hgext.rebase=
       
    15   > EOF
       
    16   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
       
    17 
       
    18   $ mkcommit() {
       
    19   >    echo "$1" > "$1"
       
    20   >    hg add "$1"
       
    21   >    hg ci -m "$1"
       
    22   > }
       
    23   $ getid() {
       
    24   >    hg id --hidden --debug -ir "$1"
       
    25   > }
       
    26 
       
    27 
       
    28 
       
    29 
       
    30 
     6 
    31 === A.2 Two heads ===
     7 === A.2 Two heads ===
    32 
     8 
    33 .. {{{
     9 .. {{{
    34 ..     ⇠○ B
    10 ..     ⇠○ B