Mercurial > hg
annotate tests/test-mq-qdiff.out @ 7707:64fd7f6d3b40
fix up tests for paths and urls help
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 25 Jan 2009 12:07:41 -0600 |
parents | fb32ae9c76e7 |
children | 561ff8d9e4f0 |
rev | line source |
---|---|
2916
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 % init |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 % commit |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 adding base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 % qnew mqbase |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 % qrefresh |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 % qdiff |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 diff -r 67e992f2c4f3 base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 --- a/base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 +++ b/base |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
2916
diff
changeset
|
10 @@ -1,1 +1,1 @@ |
2916
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
11 -base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 +patched |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 % qdiff dirname |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
14 diff -r 67e992f2c4f3 base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
15 --- a/base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
16 +++ b/base |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
2916
diff
changeset
|
17 @@ -1,1 +1,1 @@ |
2916
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 -base |
8ca608c1eb02
tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
19 +patched |
6668
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
20 % qdiff filename |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
21 diff -r 67e992f2c4f3 base |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
22 --- a/base |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
23 +++ b/base |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
24 @@ -1,1 +1,1 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
25 -base |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
26 +patched |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
27 % revert |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
28 % qpop |
7627 | 29 patch queue now empty |
6668
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
30 % qdelete mqbase |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
31 % commit 2 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
32 adding lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
33 % qnew 2 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
34 % qdiff -U 1 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
35 diff -r 35fb829491c1 lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
36 --- a/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
37 +++ b/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
38 @@ -1,1 +1,3 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
39 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
40 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
41 1 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
42 @@ -4,4 +6,4 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
43 4 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
44 -hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
45 -goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
46 +hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
47 + goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
48 7 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
49 % qdiff -b |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
50 diff -r 35fb829491c1 lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
51 --- a/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
52 +++ b/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
53 @@ -1,9 +1,11 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
54 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
55 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
56 1 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
57 2 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
58 3 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
59 4 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
60 -hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
61 -goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
62 +hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
63 + goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
64 7 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
65 8 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
66 9 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
67 % qdiff -U 1 -B |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
68 diff -r 35fb829491c1 lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
69 --- a/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
70 +++ b/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
71 @@ -4,4 +6,4 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
72 4 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
73 -hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
74 -goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
75 +hello world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
76 + goodbye world |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
77 7 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
78 qdiff -w |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
79 diff -r 35fb829491c1 lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
80 --- a/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
81 +++ b/lines |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
82 @@ -1,3 +1,5 @@ |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
83 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
84 + |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
85 1 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
86 2 |
034f444902d9
mq: qdiff: support all diffopts
Jason Orendorff <jorendorff@mozilla.com>
parents:
5863
diff
changeset
|
87 3 |