Merge with stable.
authorAugie Fackler <raf@durin42.com>
Thu, 09 May 2013 09:51:42 -0400
changeset 19158 c9431c711ddb
parent 19157 113681bbef9e (current diff)
parent 19156 ed1a212193dc (diff)
child 19163 f6109ee404d5
Merge with stable.
--- a/mercurial/subrepo.py	Wed May 08 14:11:01 2013 -0700
+++ b/mercurial/subrepo.py	Thu May 09 09:51:42 2013 -0400
@@ -31,7 +31,7 @@
 def _calcfilehash(filename):
     data = ''
     if os.path.exists(filename):
-        fd = open(filename)
+        fd = open(filename, 'rb')
         data = fd.read()
         fd.close()
     return util.sha1(data).hexdigest()