# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: james@jamesh.id.au-20170413065913-euiuro46lo0du2hj
# target_branch: https://anonscm.debian.org/bzr/pkg-bazaar/bzr-\
#   fastimport/unstable/
# testament_sha1: 8fb96ad6ec72047bd074ba33994b53f035368832
# timestamp: 2017-04-13 15:04:50 +0800
# base_revision_id: jelmer@jelmer.uk-20160424162352-ljvuanzfkajfy290
# 
# Begin patch
=== modified file 'exporter.py'
--- exporter.py	2016-04-24 16:12:34 +0000
+++ exporter.py	2017-04-13 06:59:13 +0000
@@ -372,10 +372,10 @@
             # in order for things to round-trip correctly.
             # (note: parseaddr('a@b.com') => name:'', email: 'a@b.com')
             name = user
-            email = ''
+            email = u''
         else:
             name, email = parseaddr(user)
-        return name.encode("utf-8"), email.encode("utf-8")
+        return name, email
 
     def _get_commit_command(self, git_ref, mark, revobj, file_cmds):
         # Get the committer and author info
@@ -492,7 +492,7 @@
             elif kind == 'symlink':
                 file_cmds.append(commands.FileModifyCommand(path.encode("utf-8"),
                     helpers.kind_to_mode('symlink', False),
-                    None, tree_new.get_symlink_target(id_)))
+                        None, tree_new.get_symlink_target(id_).encode('utf-8')))
             elif kind == 'directory':
                 if not self.plain_format:
                     file_cmds.append(commands.FileModifyCommand(path.encode("utf-8"),

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfZSu4IAA4r/gCRQBABQ7//3
f///8L////BgBx8AAABX2wAAACEqSNNAGgANNAGgAA0DQAAAOAYRhNMQwCAZADCNMmTCMBDQ4BhG
E0xDAIBkAMI0yZMIwENDgGEYTTEMAgGQAwjTJkwjAQ0EqkNAMgNBoBoA0AMgAA0ADQSSE0AJkaAI
xGgCGhT0nqfomAp+intExSoFEuLi/HrK/m4xeEmlfNO1FhSL33mrsgG4+TuO91rUBOCNhG3JabSI
SEjiYgz7nvyiJE7Ue83DDMDN4fRLwPGQlMwxW97OZ4MntzaDZ4naeoYYkP9ihJS759TnxnHH2/Z9
ZDHgS/hwph5N9yAPp5asZxFh8TAzcWf70IhByR1/mHdbj3c8jS/fx5CY8wIO8XMLIGpFqEc4dIZ8
OwDajISBtO0pNiF+t/FRDlSRojMkicpBkS6j66+PRdicOc6KFtGYvCUcFYYgdAQrnEgajX3IR5EU
9GSVCnvQikcGgoYVRWkyNFkj4DQ84Gop0uoGiOD7eZC9hbblV7BveOKBleMMXdZjKw7LvbynkDJJ
kxk94VTyBKTFIaWhm0xYPLjAvQjHSGSM+UVt5+TEV2oqQyEXnpupDlrzWEAY8vTCjj0V75DLQEQ6
xJZyWQdXHSF5FGwlyUQLh08xrtOUNWFiDmbMSrCcdW1nmQswEbZwG+7kImgE/O4slGBpMsqv2lpg
iW8ibYlOmUgS3469FAxaSP0l1ziiUkFSFaETonseiwxPshc3VHnAp2oYqVzi9icKC/AlomNeMoPh
gHC6mYbM56FQjEjAsi+oMqmgXPlaiQhFpkLMwGc7Zia6+fZluykOHwDI8saURUXlNZJShGprhqKN
cRyYY4ZilGb6yUXZrIuMAMAlMaEUV6YDjI7ERIFzaCpxcUATGFCosufAfiTvf+1SNWMYsTsRlC5C
lxZZXlVZNcSBDJouI0ZzE4IomwVpbZiE3wYpOAVhWSgUmUbExLbOPcXV/Om0PCN2Pp1v+up3nGzl
NdoyakkH3jLEXg0R6T0RIA8cAw6I6QJUEZRj1BzHI93QbCisGcel7NMYzcdZ2JI6EeB0n3L/E8lP
iN6j3h3F6gmEwzN8gk5/WH+G8gfRdHFGBUvjeHUdN5igKCRbCCeSc9LKrw05x7BHIeRDSESFyYLD
QvGKwmLOH7oasxnLS9Xa5d1JcFIXm5x4eOTr4z+zpumFqrF5Mf7MXxtBG6cwmCx0Ea6wmAqRxug0
wJByMkJAT0NAzhCQ5Vx1FhgvLKFIYL4kIH66aDlMo7HAghDMRsm0NbeBdFylI/2YSV3UVXHtQeKv
Dt8+VZT4G8SQ4mJw9IUrECkLTuPBK1FR/1CORj3ZyDa+HeaV7NzaT4mskt6uQIPPabuRaCgst3wi
ew0es8pSg4EpdbXZgQO2erMRWaM8Pn2vyUUz3zGffbqOe9k4uK8zQSQ7DlNlRczaZR+BSiEwDXPC
IGsZ+YnyY2LqsjuxPfshnpOAVOMwE/BCyec/0Swvcc2ToizWT04xljH1PhxNTCN+Y1YUHYYiJsYx
g47ripA/JQUTcb88L9hlwWDFpolxlBnJevEcUjjQfgcEgjn/xuuHaai8PeJgLx6Kdjx6ObOOQLAZ
JErEgxrT/sAwjC2IdQwEpsdDM+5HJ0c5oqCvaTdBu4nhzcw/APpl+yF+jmMDWGlyLRVIW8IL7RyO
41nSMpv1XnVchd/QciSNDL1PcI5Q0m/LlAdITZ0q0KC3jz4XmdY0kbg9wvzIPN1BoCwsQtCYUEuL
0oLaPMVbjAkKRHUI6T0APJu5L+dmYPE/pXeUdYJk9459p/EkUMh6MoVC302ocOMwfg1oLw2raA4R
66B4bmDvormFnHfE3hrLgnEegCoOMemRMh4hgBZCkKS0/4SEgSBLBBjY1LznfMe+udBKszrxmLpQ
fFp6HiT2AYUAz3AWAer/xnPZrUjHFQI+/9Ei6kFSXmlGQPFhx6yf49xhsGGAkD0zHID3gwxTpidw
m69K1JGcZFKDvJi+ILu/lBzhcGgIlO+dVJUoHPxEEiQZJiPTF16FBJHyhIfAIFjJIlHvODDWlRaO
OMQ8wCkMbA1KVKVCDWUO4ITp5I7VKOYcG+B8oGMI3hPPehdUQpC0iSgwc4Z3S1maYuCYFYKVydwk
cBgTGKVwkZAGKvQD5AONHMEtVyoA/dnuLBUCHBc7jDh4fapCsQsSFKltQmAwN4mCQPMHXvnOaX9H
5Y1rMsAxWDoNAfxdyRThQkPZSu4I