merge with crew-stable stable
authorBryan O'Sullivan <bryano@fb.com>
Mon, 23 Jul 2012 15:40:19 -0700
branchstable
changeset 17238 57a47190e96c
parent 17236 9fb8312dbdbd (current diff)
parent 17237 e73128535105 (diff)
child 17240 ffc49100151b
merge with crew-stable
--- 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):