tests/test-up-local-change
changeset 485 c5705ab9cebd
parent 350 b4e0e20646bb
child 544 3d4d5f2aba9a
child 547 4fc63e22b1fe
equal deleted inserted replaced
484:934279f3ca53 485:c5705ab9cebd
     8 hg init
     8 hg init
     9 echo a > a
     9 echo a > a
    10 hg addremove
    10 hg addremove
    11 hg commit -t "1" -u test -d "0 0"
    11 hg commit -t "1" -u test -d "0 0"
    12 
    12 
    13 cd ..
    13 hg clone . ../r2
    14 mkdir r2
    14 cd ../r2
    15 cd r2
       
    16 hg init ../r1
       
    17 hg up
    15 hg up
    18 echo abc > a
    16 echo abc > a
    19 hg diff > ../d
    17 hg diff > ../d
    20 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
    18 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
    21 
    19