Commits

Augie Fackler  committed 093ae29 Merge

Merge fix for pushable bookmarks.

  • Participants
  • Parent commits faba8e6, c38fe89
  • Tags 1.1.2

Comments (0)

Files changed (2)

File hgsubversion/svnrepo.py

         """
         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:

File tests/run.py

         demandimport.enable()
 
     # silence output when running outside nose
-    sys.stdout = os.tmpfile()
+    import tempfile
+    sys.stdout = tempfile.TemporaryFile()
 
     all = tests()
     del all['test_util']