# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: li.anye.0@gmail.com-20110302050257-502h3x5sd4wwj4al
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/bzr-cvsps-\
#   import/
# testament_sha1: 5dcea6058e2ec4ce154fe898b493b30af4350c7f
# timestamp: 2011-03-02 00:05:15 -0500
# base_revision_id: maxb@f2s.com-20110224001959-888v95353zc9dznz
# 
# Begin patch
=== modified file 'cvsps/importer.py'
--- cvsps/importer.py	2011-02-24 00:04:28 +0000
+++ cvsps/importer.py	2011-03-02 05:02:57 +0000
@@ -1011,7 +1011,7 @@
         revision_id = self._cur_tree.commit(
             branch=self._cur_bzr_branch,
             branch_name=patchset.branch,
-            message=u''.join(patchset.log),
+            message=u''.join(patchset.log).replace('\r\n','\n').replace('\r','\n'),
             timestamp=patchset.timestamp,
             timezone=patchset.time_offset,
             committer=patchset.author,

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRjzA9UAAZLfgEBQUOf/93IE
EAS////wUAN0w9udinvdpnhJFASeEaJ5GmqfhGUynqaDIbU0MMlGpsU1PyTxpU9qjQAGgaAaAEkQ
TQIyNNU/VPaKPRPUaaPU0ANAMlGUDTQPSaNDepADQAAeoElKfpT0aJP1CZqHiJk2owg0GCB2Mhw4
p6S2hVU1nbUAKvbZlmXfL5G/GuyiIg9dpezBBUPeQRb/v9X1b4ID0/0ETNT7Mju/iR00XevVOyP5
Mamz5GhUcYsoz9c3P7bwNxX3EcxZl6noxw1SaqkrYKEoQ4JYV5rcZSvuu1kLVvXiywjJOwhwdbxO
LvBMLKJITLntKKa6pcOlKS62/02i8fZT4xTlBGZbrcIuV0yU/nCis91e/w0hMoOfledvpuqzygaV
p8Ws0y4lLSp6mQqC7QmUNZDsF4MKS0i94yLapiyCclAVt46STQrKp7+nOXCZYKTEDk1ZIjZTWD8J
OQCQ9xY4VCnJd/gK0U0sj7FLYsZC/cK+RWjxlvAT7MjHUN/MbwwaAmbTou1zBng51pC+V1qwGWbh
FhZBBiJU2NF4ljkkAgpUKqjM5FZvi0aDyRFC6cG/p0lROO7a15fBYLZ3zz4Flr3QlGxpyYLIFTpo
tEmE6m8jbjLvrG0d8PXtgGtLCMnYY9noh0fsO7s0Oun6KAG6QjBZjkW/+8wUXaaZawrSvFyyqqj3
dUtNKETDNEweV0Rl1C7Pi+ASV2F0nFSky9GrssgetI3a+XMeWPWzY64DCj7ZrEmnir9+hD5VK3w6
ePc5BJ9JEHloPzhxja15YQz6TWRrCt8yLxpaf5m+mXs0f5c8jomXux4LzafHPDDiEMoSKCvJu4X3
0Ptu2kQ9B3uq4MZ1Nz89EtiUEiyApKBWgyRn45Sa4tSoLrI+DylWYbw4mYsFSlBgEfoMfJ9nY/tC
4NPJzZGFvtJBoLoZQZJ1oRB99uYydTU/I4DYYxOG7TDLZJI7Jc1YFdb+ewzKE5ESHhEKMAiaIQIU
VxECFAHtJpNFG0XLwX01SDEFdREP9YockRWGW7JmXdAj992SiFetOhyX4vr4li6jJy8O0kULPViZ
VV9XVz4ZSkhmDpGPwB+RTeqfYUuDjV1ZwdOt1BEJkQy+b8zNYSa9jCmo1UQqhgIYqApVroOUdH91
+o0/BTBkDD4g+XsLiKocbxTBZEwEuIoKRAFnPN4VEodP+LuSKcKEgMeYHqg=