Mercurial > hg
view tests/test-mq-qdiff.out @ 7004:90227c42b5f6
c0bd7d8b69ef uses err() instead of warn() but prototype doesn't match
we might want to make warn() look more like err() in the future
to avoid this kind of problem.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 08 Sep 2008 00:50:34 +0200 |
parents | 034f444902d9 |
children | fb32ae9c76e7 |
line wrap: on
line source
% init % commit adding base % qnew mqbase % qrefresh % qdiff diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched % qdiff filename diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched % revert % qpop Patch queue now empty % qdelete mqbase % commit 2 adding lines % qnew 2 % qdiff -U 1 diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,1 +1,3 @@ + + 1 @@ -4,4 +6,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 % qdiff -b diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,9 +1,11 @@ + + 1 2 3 4 -hello world -goodbye world +hello world + goodbye world 7 8 9 % qdiff -U 1 -B diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -4,4 +6,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 qdiff -w diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,3 +1,5 @@ + + 1 2 3