# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1504234960 14400
# Node ID 9a3b2b3fe4ced34c5083753449f4562b9aecec40
# Parent  dee572a4e30b4dbe4758728ef25cadbccdbefc5f
meta: more forceutf8 love, this time on subdir handling

diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py
--- a/hgsubversion/svnmeta.py
+++ b/hgsubversion/svnmeta.py
@@ -227,6 +227,7 @@ class SVNMeta(object):
         return self.__subdir
 
     def _set_subdir(self, subdir):
+        subdir = util.forceutf8(subdir)
         if subdir:
             subdir = '/'.join(p for p in subdir.split('/') if p)
 
@@ -446,6 +447,7 @@ class SVNMeta(object):
         '''Normalize a path to strip of leading slashes and our subdir if we
         have one.
         '''
+        path = util.forceutf8(path)
         if self.subdir and path == self.subdir[:-1]:
             return ''
         if path and path[0] == '/':