# HG changeset patch # User Bryan O'Sullivan # Date 2012-09-04 22:50:42 # Node ID 1526ac765e290a6f912e1fca1a66e544ac39e2e7 # Parent 5be041254a2e8533016805e14bdf3eb716d27754 # Parent b9698f19b9291f827cf16978f552e466c9c1ec6c Merge with crew-stable diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -838,7 +838,7 @@ class svnsubrepo(abstractsubrepo): name = ''.join(c.data for c in e.getElementsByTagName('name')[0].childNodes if c.nodeType == c.TEXT_NODE) - paths.append(name) + paths.append(name.encode('utf-8')) return paths def filedata(self, name):