tests/test-up-local-change
changeset 949 d997148155f2
parent 814 0902ffece4b4
child 953 52d8d81e72ad
equal deleted inserted replaced
940:1300271ba8de 949:d997148155f2
    10 
    10 
    11 hg clone . ../r2
    11 hg clone . ../r2
    12 cd ../r2
    12 cd ../r2
    13 hg up
    13 hg up
    14 echo abc > a
    14 echo abc > a
    15 hg diff > ../d
    15 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
    16 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
    16               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
    17 
    17 
    18 cd ../r1
    18 cd ../r1
    19 echo b > b
    19 echo b > b
    20 echo a2 > a
    20 echo a2 > a
    21 hg addremove
    21 hg addremove
    26 hg status
    26 hg status
    27 hg --debug up
    27 hg --debug up
    28 hg --debug up -m
    28 hg --debug up -m
    29 hg parents
    29 hg parents
    30 hg -v history
    30 hg -v history
    31 hg diff > ../d
    31 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
    32 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
    32               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
    33 
    33