Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-encoding.out @ 5210:90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 23 Aug 2007 01:48:29 -0300 |
parents | 30d4d8985dd8 |
children |
rev | line source |
---|---|
3779 | 1 adding changesets |
2 adding manifests | |
3 adding file changes | |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
4 added 2 changesets with 2 changes to 1 files |
3779 | 5 (run 'hg update' to get a working copy) |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 % should fail with encoding error | |
8 M a | |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
9 ? latin-1 |
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
10 ? latin-1-tag |
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
11 ? utf-8 |
3779 | 12 transaction abort! |
13 rollback completed | |
4970
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
4675
diff
changeset
|
14 abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! |
3779 | 15 % these should work |
4602
d9d177ef748a
Fix up tests for new branch message
Brendan Cully <brendan@kublai.com>
parents:
4204
diff
changeset
|
16 marked working directory as branch é |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
17 % ascii |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
18 changeset: 5:db5520b4645f |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
19 branch: ? |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
20 tag: tip |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
21 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
22 date: Mon Jan 12 13:46:40 1970 +0000 |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
23 summary: latin1 branch |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
24 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
25 changeset: 4:9cff3c980b58 |
3779 | 26 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
27 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
28 summary: Added tag ? for changeset 770b9b11621d |
3779 | 29 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
30 changeset: 3:770b9b11621d |
3779 | 31 tag: ? |
32 user: test | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
33 date: Mon Jan 12 13:46:40 1970 +0000 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
34 summary: utf-8 e' encoded: ? |
3779 | 35 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
36 changeset: 2:0572af48b948 |
3779 | 37 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
38 date: Mon Jan 12 13:46:40 1970 +0000 |
3779 | 39 summary: latin-1 e' encoded: ? |
40 | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
41 changeset: 1:0e5b7e3f9c4a |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
42 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
43 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
44 summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
45 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
46 changeset: 0:1e78a93102a3 |
3779 | 47 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
48 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
49 summary: latin-1 e': ? = u'\xe9' |
3779 | 50 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
51 % latin-1 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
52 changeset: 5:db5520b4645f |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
53 branch: é |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
54 tag: tip |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
55 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
56 date: Mon Jan 12 13:46:40 1970 +0000 |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
57 summary: latin1 branch |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
58 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
59 changeset: 4:9cff3c980b58 |
3779 | 60 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
61 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
62 summary: Added tag é for changeset 770b9b11621d |
3779 | 63 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
64 changeset: 3:770b9b11621d |
3779 | 65 tag: é |
66 user: test | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
67 date: Mon Jan 12 13:46:40 1970 +0000 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
68 summary: utf-8 e' encoded: é |
3779 | 69 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
70 changeset: 2:0572af48b948 |
3779 | 71 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
72 date: Mon Jan 12 13:46:40 1970 +0000 |
3779 | 73 summary: latin-1 e' encoded: é |
74 | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
75 changeset: 1:0e5b7e3f9c4a |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
76 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
77 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
78 summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
79 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
80 changeset: 0:1e78a93102a3 |
3779 | 81 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
82 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
83 summary: latin-1 e': é = u'\xe9' |
3779 | 84 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
85 % utf-8 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
86 changeset: 5:db5520b4645f |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
87 branch: é |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
88 tag: tip |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
89 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
90 date: Mon Jan 12 13:46:40 1970 +0000 |
3824
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
91 summary: latin1 branch |
3674ca805a5b
log: convert branch names to the local encoding
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3784
diff
changeset
|
92 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
93 changeset: 4:9cff3c980b58 |
3779 | 94 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
95 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
96 summary: Added tag é for changeset 770b9b11621d |
3779 | 97 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
98 changeset: 3:770b9b11621d |
3779 | 99 tag: é |
100 user: test | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
101 date: Mon Jan 12 13:46:40 1970 +0000 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
102 summary: utf-8 e' encoded: é |
3779 | 103 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
104 changeset: 2:0572af48b948 |
3779 | 105 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
106 date: Mon Jan 12 13:46:40 1970 +0000 |
3779 | 107 summary: latin-1 e' encoded: é |
108 | |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
109 changeset: 1:0e5b7e3f9c4a |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
110 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
111 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
112 summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
113 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
114 changeset: 0:1e78a93102a3 |
3779 | 115 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
116 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
117 summary: latin-1 e': é = u'\xe9' |
3779 | 118 |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
119 % ascii |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
120 tip 5:db5520b4645f |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
121 ? 3:770b9b11621d |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
122 % latin-1 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
123 tip 5:db5520b4645f |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
124 é 3:770b9b11621d |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
125 % utf-8 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
126 tip 5:db5520b4645f |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
127 é 3:770b9b11621d |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
128 % ascii |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
129 ? 5:db5520b4645f |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
4602
diff
changeset
|
130 default 4:9cff3c980b58 (inactive) |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
131 % latin-1 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
132 é 5:db5520b4645f |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
4602
diff
changeset
|
133 default 4:9cff3c980b58 (inactive) |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
134 % utf-8 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
135 é 5:db5520b4645f |
4675
6858a7477a5e
Change branches to sort 'active' branches first, and add an option to show only active branches.
Eric Hopper <hopper@omnifarious.org>
parents:
4602
diff
changeset
|
136 default 4:9cff3c980b58 (inactive) |
3784
4421cef5d3f0
Make quoting in test-encoding simpler
Matt Mackall <mpm@selenic.com>
parents:
3781
diff
changeset
|
137 % utf-8 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
138 changeset: 5:db5520b4645f |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
139 branch: é |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
140 tag: tip |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
141 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
142 date: Mon Jan 12 13:46:40 1970 +0000 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
143 summary: latin1 branch |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
144 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
145 changeset: 4:9cff3c980b58 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
146 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
147 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
148 summary: Added tag é for changeset 770b9b11621d |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
149 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
150 changeset: 3:770b9b11621d |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
151 tag: é |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
152 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
153 date: Mon Jan 12 13:46:40 1970 +0000 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
154 summary: utf-8 e' encoded: é |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
155 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
156 changeset: 2:0572af48b948 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
157 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
158 date: Mon Jan 12 13:46:40 1970 +0000 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
159 summary: latin-1 e' encoded: é |
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
160 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
161 changeset: 1:0e5b7e3f9c4a |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
162 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
163 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
164 summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
165 |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
166 changeset: 0:1e78a93102a3 |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
167 user: test |
3839
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
168 date: Mon Jan 12 13:46:40 1970 +0000 |
3820385fb113
Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3835
diff
changeset
|
169 summary: latin-1 e': И = u'\xe9' |
3835
d1ce5461beed
Allow the user to specify the fallback encoding for the changelog
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3824
diff
changeset
|
170 |
3843
abaa2cd00d2b
make transcoding more robust
Matt Mackall <mpm@selenic.com>
parents:
3839
diff
changeset
|
171 abort: unknown encoding: dolphin, please check your locale settings |
3862
46abbed02b2d
Use UTF-8 in .hg/branch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3843
diff
changeset
|
172 abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! |
46abbed02b2d
Use UTF-8 in .hg/branch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3843
diff
changeset
|
173 abort: branch name not in UTF-8! |