Mercurial > hg
diff tests/test-mq-qdiff @ 6668:034f444902d9
mq: qdiff: support all diffopts
author | Jason Orendorff <jorendorff@mozilla.com> |
---|---|
date | Thu, 12 Jun 2008 07:38:15 -0500 |
parents | 61fcd9fac434 |
children | 3f522d2fa633 |
line wrap: on
line diff
--- a/tests/test-mq-qdiff Thu Jun 12 11:01:36 2008 +0200 +++ b/tests/test-mq-qdiff Thu Jun 12 07:38:15 2008 -0500 @@ -25,3 +25,35 @@ echo % qdiff dirname hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qdiff filename +hg qdiff --nodates base + +echo % revert +hg revert -a + +echo % qpop +hg qpop + +echo % qdelete mqbase +hg qdelete mqbase + +echo % commit 2 +printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines +hg ci -Amlines -d '2 0' + +echo % qnew 2 +hg qnew -mmqbase2 mqbase2 +printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines + +echo % qdiff -U 1 +hg qdiff --nodates -U 1 + +echo % qdiff -b +hg qdiff --nodates -b + +echo % qdiff -U 1 -B +hg qdiff --nodates -U 1 -B + +echo qdiff -w +hg qdiff --nodates -w