2009/8/13 Brett Cannon <br...@python.org>:
> I am trying to backport something to 2.6 and I am getting the following
> error from svnmerge.py:
>> svnmerge.py merge -r74429t
> property 'svnmerge-integrated' deleted from '.'.
> property 'svnmerge-blocked' deleted from '.'.
> --- Merging r74429 into '.':
> C Misc/NEWS
> U Misc/ACKS
> U Lib/test/test_pyexpat.py
> U Modules/expat/xmltok_impl.c
> Summary of conflicts:
> Text conflicts: 1
> property 'svnmerge-integrated' set on '.'
> property 'svnmerge-blocked' set on '.'
> Traceback (most recent call last):
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 2361, in
> <module>
> main(sys.argv[1:])
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 2356, in main
> cmd(branch_dir, branch_props)
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1810, in
> __call__
> return self.func(*args, **kwargs)
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1560, in
> action_merge
> print >>f, construct_merged_log_message(opts["source-url"], revs),
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1136, in
> construct_merged_log_message
> message = get_commit_log(url, r)
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 1122, in
> get_commit_log
> return recode_stdout_to_file("".join(out[1:]))
> File "/Users/brett/.slash/python/svnmerge/svnmerge.py", line 229, in
> recode_stdout_to_file
> return u.encode(locale.getdefaultlocale()[1])
> File "/Users/brett/.slash/python/lib/python2.6/encodings/mac_roman.py",
> line 12, in encode
> return codecs.charmap_encode(input,errors,encoding_table)
> UnicodeEncodeError: 'charmap' codec can't encode character u'\u0107' in
> position 191: character maps to <undefined>
>
> Anyone else running into this? I tried backing up svnmerge.py to r36767
> (sometime in March; random choice) and I am still having the problem.
I just ran svnmerge on tk_and_idle_maintenance branch and it worked
fine (r74434). Unfortunately the svnmerge.py I use doesn't include its
revision number, so svnmerge.__rev__ and .__date__ are set to
'<unknown>'.
> -Brett
--
-- Guilherme H. Polo Goncalves
_______________________________________________
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers
