Mercurial > hg
annotate tests/test-merge6.out @ 12252:4481f8a93c7a stable
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | a3d73b3e1f8a |
children |
rev | line source |
---|---|
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
1 updating to branch default |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
3 updating to branch default |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
5 updating to branch default |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 | 7 pulling from ../B1 |
8 searching for changes | |
9 adding changesets | |
10 adding manifests | |
775 | 11 adding file changes |
1043 | 12 added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
13 (run 'hg heads' to see heads, 'hg merge' to merge) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
15 (branch merge, don't forget to commit) |
616 | 16 bar should remain deleted. |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2175
diff
changeset
|
17 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
616 | 18 pulling from ../A2 |
19 searching for changes | |
20 adding changesets | |
21 adding manifests | |
775 | 22 adding file changes |
1043 | 23 added 1 changesets with 0 changes to 0 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
24 (run 'hg heads' to see heads, 'hg merge' to merge) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
26 (branch merge, don't forget to commit) |
616 | 27 bar should remain deleted. |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2175
diff
changeset
|
28 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |