tests/test-mq-qdiff
changeset 6668 034f444902d9
parent 2990 61fcd9fac434
child 9725 3f522d2fa633
equal deleted inserted replaced
6667:01e95d4bc66c 6668:034f444902d9
    23                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
    23                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
    24 
    24 
    25 echo % qdiff dirname
    25 echo % qdiff dirname
    26 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
    26 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
    27                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
    27                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
       
    28 
       
    29 echo % qdiff filename
       
    30 hg qdiff --nodates base
       
    31 
       
    32 echo % revert
       
    33 hg revert -a
       
    34 
       
    35 echo % qpop
       
    36 hg qpop
       
    37 
       
    38 echo % qdelete mqbase
       
    39 hg qdelete mqbase
       
    40 
       
    41 echo % commit 2
       
    42 printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines
       
    43 hg ci -Amlines -d '2 0'
       
    44 
       
    45 echo % qnew 2
       
    46 hg qnew -mmqbase2 mqbase2
       
    47 printf '\n\n1\n2\n3\n4\nhello  world\n     goodbye world\n7\n8\n9\n' > lines
       
    48 
       
    49 echo % qdiff -U 1
       
    50 hg qdiff --nodates -U 1
       
    51 
       
    52 echo % qdiff -b
       
    53 hg qdiff --nodates -b
       
    54 
       
    55 echo % qdiff -U 1 -B
       
    56 hg qdiff --nodates -U 1 -B
       
    57 
       
    58 echo qdiff -w
       
    59 hg qdiff --nodates -w