I am trying to backport something to 2.6 and I am getting the following error from svnmerge.py:<div><br></div><div><div>&gt; svnmerge.py merge -r74429t</div><div>property &#39;svnmerge-integrated&#39; deleted from &#39;.&#39;.</div>

<div><br></div><div>property &#39;svnmerge-blocked&#39; deleted from &#39;.&#39;.</div><div><br></div><div>--- Merging r74429 into &#39;.&#39;:</div><div>C    Misc/NEWS</div><div>U    Misc/ACKS</div><div>U    Lib/test/test_pyexpat.py</div>

<div>U    Modules/expat/xmltok_impl.c</div><div>Summary of conflicts:</div><div>  Text conflicts: 1</div><div><br></div><div>property &#39;svnmerge-integrated&#39; set on &#39;.&#39;</div><div><br></div><div>property &#39;svnmerge-blocked&#39; set on &#39;.&#39;</div>

<div><br></div><div>Traceback (most recent call last):</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 2361, in &lt;module&gt;</div><div>    main(sys.argv[1:])</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 2356, in main</div>

<div>    cmd(branch_dir, branch_props)</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 1810, in __call__</div><div>    return self.func(*args, **kwargs)</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 1560, in action_merge</div>

<div>    print &gt;&gt;f, construct_merged_log_message(opts[&quot;source-url&quot;], revs),</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 1136, in construct_merged_log_message</div><div>

    message = get_commit_log(url, r)</div><div>  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 1122, in get_commit_log</div><div>    return recode_stdout_to_file(&quot;&quot;.join(out[1:]))</div>
<div>
  File &quot;/Users/brett/.slash/python/svnmerge/svnmerge.py&quot;, line 229, in recode_stdout_to_file</div><div>    return u.encode(locale.getdefaultlocale()[1])</div><div>  File &quot;/Users/brett/.slash/python/lib/python2.6/encodings/mac_roman.py&quot;, line 12, in encode</div>

<div>    return codecs.charmap_encode(input,errors,encoding_table)</div><div>UnicodeEncodeError: &#39;charmap&#39; codec can&#39;t encode character u&#39;\u0107&#39; in position 191: character maps to &lt;undefined&gt;</div>

<div><br></div><div><br></div><div>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.</div><div><br></div><div>-Brett</div></div>