tests/test-up-local-change
changeset 332 6c869059beb4
parent 331 55f63f3b6a54
child 349 b2293093b89e
child 350 b4e0e20646bb
equal deleted inserted replaced
331:55f63f3b6a54 332:6c869059beb4
    14 mkdir r2
    14 mkdir r2
    15 cd r2
    15 cd r2
    16 hg init ../r1
    16 hg init ../r1
    17 hg up
    17 hg up
    18 echo abc > a
    18 echo abc > a
    19 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"
    19 hg diff > ../d
       
    20 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
    20 
    21 
    21 cd ../r1
    22 cd ../r1
    22 echo b > b
    23 echo b > b
    23 echo a2 > a
    24 echo a2 > a
    24 hg addremove
    25 hg addremove
    29 hg status
    30 hg status
    30 hg -d up
    31 hg -d up
    31 hg -d up -m
    32 hg -d up -m
    32 hg parents
    33 hg parents
    33 hg -v history
    34 hg -v history
    34 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"
    35 hg diff > ../d
       
    36 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
    35 
    37