tests/test-up-local-change.out
changeset 396 8f8bb77d560e
parent 388 398737777644
child 485 c5705ab9cebd
equal deleted inserted replaced
395:fbe8834923c5 396:8f8bb77d560e
    10 + hg init ../r1
    10 + hg init ../r1
    11 + hg up
    11 + hg up
    12 + echo abc
    12 + echo abc
    13 + hg diff
    13 + hg diff
    14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
    14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
       
    15 diff -r c19d34741b0a a
    15 --- a/a
    16 --- a/a
    16 +++ b/a
    17 +++ b/a
    17 @@ -1,1 +1,1 @@
    18 @@ -1,1 +1,1 @@
    18 -a
    19 -a
    19 +abc
    20 +abc
    63 description:
    64 description:
    64 1
    65 1
    65 
    66 
    66 + hg diff
    67 + hg diff
    67 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
    68 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
       
    69 diff -r 1e71731e6fbb a
    68 --- a/a
    70 --- a/a
    69 +++ b/a
    71 +++ b/a
    70 @@ -1,1 +1,1 @@
    72 @@ -1,1 +1,1 @@
    71 -a2
    73 -a2
    72 +abc
    74 +abc