tests/test-up-local-change
changeset 800 ec85f9e6f3b1
parent 793 445970ccf57a
child 808 8f5637f0a0c0
equal deleted inserted replaced
799:583e290e4945 800:ec85f9e6f3b1
     1 #!/bin/sh
     1 #!/bin/sh
     2 
     2 
     3 set -ex
     3 set -e
     4 mkdir r1
     4 mkdir r1
     5 cd r1
     5 cd r1
     6 hg init
     6 hg init
     7 echo a > a
     7 echo a > a
     8 hg addremove
     8 hg addremove
    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 > ../d
    16 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
    16 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
    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
    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 > ../d
    32 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
    32 sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
    33 
    33