Index: llvm/utils/git-svn/git-llvm
===================================================================
--- llvm/utils/git-svn/git-llvm
+++ llvm/utils/git-svn/git-llvm
@@ -98,8 +98,8 @@
             eprint('`%s` printed to stderr:' % ' '.join(cmd))
             eprint(stderr.rstrip())
         if strip:
-            stdout = stdout.rstrip('\r\n')
-        return stdout
+            stdout = stdout.rstrip(b'\r\n')
+        return stdout.decode('utf-8')
     err_msg = '`%s` returned %s' % (' '.join(cmd), p.returncode)
     eprint(err_msg)
     if stderr:
@@ -117,7 +117,6 @@
     # TODO: Better way to do default arg when we have *cmd?
     return shell(['svn'] + list(cmd), cwd=cwd, stdin=kwargs.get('stdin', None))
 
-
 def get_default_rev_range():
     # Get the branch tracked by the current branch, as set by
     # git branch --set-upstream-to  See http://serverfault.com/a/352236/38694.
@@ -191,8 +190,8 @@
         # git is the only thing that can handle its own patches...
         log_verbose('Apply patch: %s' % diff)
         try:
-            shell(['git', 'apply', '-p2', '-'], cwd=svn_sr_path, stdin=diff,
-                  die_on_failure=False)
+            shell(['git', 'apply', '-p2', '-'], cwd=svn_sr_path,
+                   stdin=diff.encode('utf-8'), die_on_failure=False)
         except RuntimeError as e:
             eprint("Patch doesn't apply: maybe you should try `git pull -r` "
                    "first?")