changeset 17238:57a47190e96c stable

merge with crew-stable
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 23 Jul 2012 15:40:19 -0700
parents 9fb8312dbdbd (current diff) e73128535105 (diff)
children ffc49100151b
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Mon Jul 23 15:55:26 2012 -0600
+++ b/mercurial/util.py	Mon Jul 23 15:40:19 2012 -0700
@@ -816,6 +816,8 @@
 
         # delegated methods
         self.write = self._fp.write
+        self.seek = self._fp.seek
+        self.tell = self._fp.tell
         self.fileno = self._fp.fileno
 
     def close(self):