Show More
@@ -13,6 +13,7 b' and O(changes) merge between branches.' | |||||
13 |
|
13 | |||
14 | from __future__ import absolute_import |
|
14 | from __future__ import absolute_import | |
15 |
|
15 | |||
|
16 | import binascii | |||
16 | import collections |
|
17 | import collections | |
17 | import errno |
|
18 | import errno | |
18 | import hashlib |
|
19 | import hashlib | |
@@ -1094,7 +1095,7 b' class revlog(object):' | |||||
1094 | if maybewdir: |
|
1095 | if maybewdir: | |
1095 | raise error.WdirUnsupported |
|
1096 | raise error.WdirUnsupported | |
1096 | return None |
|
1097 | return None | |
1097 | except TypeError: |
|
1098 | except (TypeError, binascii.Error): | |
1098 | pass |
|
1099 | pass | |
1099 |
|
1100 | |||
1100 | def lookup(self, id): |
|
1101 | def lookup(self, id): |
General Comments 0
You need to be logged in to leave comments.
Login now