changeset 17443:1526ac765e29

Merge with crew-stable
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 04 Sep 2012 15:50:42 -0700
parents 5be041254a2e (current diff) b9698f19b929 (diff)
children d527ac9f011d
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Fri Aug 31 13:08:11 2012 +0200
+++ b/mercurial/subrepo.py	Tue Sep 04 15:50:42 2012 -0700
@@ -838,7 +838,7 @@
             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):