changeset 630:093ae2915b45 1.1.2

Merge fix for pushable bookmarks.
author Augie Fackler <durin42@gmail.com>
date Tue, 06 Jul 2010 10:41:54 -0500
parents faba8e636960 (current diff) c38fe89a5cbc (diff)
children 493023041e74
files
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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']