Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-diffdir.out @ 3538:9b52239dc740
save settings from untrusted config files in a separate configparser
This untrusted configparser is a superset of the trusted configparser,
so that interpolation still works.
Also add an "untrusted" argument to ui.config* to allow querying
ui.ucdata.
With --debug, we print a warning when we read an untrusted config
file, and when we try to access a trusted setting that has one value
in the trusted configparser and another in the untrusted configparser.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 26 Oct 2006 19:25:45 +0200 |
parents | 7544700fd931 |
children | 000d122071b5 |
rev | line source |
---|---|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
diff
changeset
|
1 diff -r acd8075edac9 b |
536 | 2 --- /dev/null |
3 +++ b/b | |
4 @@ -0,0 +1,1 @@ | |
5 +123 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
diff
changeset
|
6 diff -r acd8075edac9 b |
536 | 7 --- /dev/null |
8 +++ b/b | |
9 @@ -0,0 +1,1 @@ | |
10 +123 | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
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 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
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 |