tests/test-up-local-change.out
changeset 485 c5705ab9cebd
parent 396 8f8bb77d560e
child 490 df9b77f67998
child 495 e94cebc60d96
equal deleted inserted replaced
484:934279f3ca53 485:c5705ab9cebd
     2 + cd r1
     2 + cd r1
     3 + hg init
     3 + hg init
     4 + echo a
     4 + echo a
     5 + hg addremove
     5 + hg addremove
     6 + hg commit -t 1 -u test -d '0 0'
     6 + hg commit -t 1 -u test -d '0 0'
     7 + cd ..
     7 + hg clone . ../r2
     8 + mkdir r2
     8 + cd ../r2
     9 + cd r2
       
    10 + hg init ../r1
       
    11 + hg up
     9 + hg up
    12 + echo abc
    10 + echo abc
    13 + hg diff
    11 + hg diff
    14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
    12 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
    15 diff -r c19d34741b0a a
    13 diff -r c19d34741b0a a