# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1407702393 18000
# Node ID 711b5cfddb1bd9ecd7b995d9a0bfb39ea2de326c
# Parent  a82c5975095dcff308a267062c4626cec20ad665# Parent  1e392c63fb76a4fe389c90c90b2db594c637a57f
merge with stable

diff -r a82c5975095d -r 711b5cfddb1b tests/test-bundle2.t
--- a/tests/test-bundle2.t	Sun Aug 10 14:30:30 2014 -0500
+++ b/tests/test-bundle2.t	Sun Aug 10 15:26:33 2014 -0500
@@ -125,7 +125,7 @@
   >     if path is None:
   >        file = sys.stdout
   >     else:
-  >         file = open(path, 'w')
+  >         file = open(path, 'wb')
   > 
   >     for chunk in bundler.getchunks():
   >         file.write(chunk)
@@ -157,7 +157,7 @@
   >     for rec in op.records['changegroup']:
   >         ui.write('addchangegroup return: %i\n' % rec['return'])
   >     if op.reply is not None and replypath is not None:
-  >         file = open(replypath, 'w')
+  >         file = open(replypath, 'wb')
   >         for chunk in op.reply.getchunks():
   >             file.write(chunk)
   >