# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1278430914 18000
# Node ID 093ae2915b452539b44390ee4ea14987484e1eee
# Parent  faba8e6369605ef3951976aa0871bf1315282ce3# Parent  c38fe89a5cbce2dc4f5ffa002e6e36eda4623114
Merge fix for pushable bookmarks.

diff --git a/hgsubversion/svnrepo.py b/hgsubversion/svnrepo.py
--- a/hgsubversion/svnrepo.py
+++ b/hgsubversion/svnrepo.py
@@ -125,6 +125,12 @@ class svnremoterepo(mercurial.repo.repos
         """
         raise hgutil.Abort('command unavailable for Subversion repositories')
 
+    def pushkey(self, namespace, key, old, new):
+        return False
+
+    def listkeys(self, namespace):
+        return {}
+
 def instance(ui, url, create):
     if url.startswith('http://') or url.startswith('https://'):
         try:
diff --git a/tests/run.py b/tests/run.py
--- a/tests/run.py
+++ b/tests/run.py
@@ -70,7 +70,8 @@ if __name__ == '__main__':
         demandimport.enable()
 
     # silence output when running outside nose
-    sys.stdout = os.tmpfile()
+    import tempfile
+    sys.stdout = tempfile.TemporaryFile()
 
     all = tests()
     del all['test_util']