Mercurial > hg
annotate tests/test-diffdir.out @ 6047:a7178d4ed8ee
fix syntax in coverage.py, fixing run-tests.py -C
d0576d065993 accidentally broke things.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 08 Feb 2008 13:16:49 -0200 |
parents | f80cf8b7bbd9 |
children | c0c4c7b1e8d3 |
rev | line source |
---|---|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
1 diff -r acd8075edac9 b |
536 | 2 --- /dev/null |
3 +++ b/b | |
4 @@ -0,0 +1,1 @@ | |
5 +123 | |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
6 diff -r acd8075edac9 b |
536 | 7 --- /dev/null |
8 +++ b/b | |
9 @@ -0,0 +1,1 @@ | |
10 +123 | |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
11 diff -r acd8075edac9 a |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
12 --- a/a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
13 +++ b/a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
14 @@ -0,0 +1,1 @@ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
15 +foo |
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
16 diff -r acd8075edac9 b |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
17 --- /dev/null |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
18 +++ b/b |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
19 @@ -0,0 +1,1 @@ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
20 +123 |
3825
000d122071b5
fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
21 abort: Ambiguous identifier! |
000d122071b5
fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
22 abort: Ambiguous identifier! |