Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Jul 2008 04:35:32 +0000 (06:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Jul 2008 04:35:32 +0000 (06:35 +0200)
1  2 
__init__.py
branch.py
commit.py
errors.py
repository.py
tests/test_commit.py
tree.py
workingtree.py

diff --cc __init__.py
Simple merge
diff --cc branch.py
index c848b5b6916c428115f50e65cb27a28f85f08c60,3d3f9531e9f862381218a3b009aed4b5d9dcc448..79ec658b1955e05b3ef8a2563b3fc758433afee3
+++ b/branch.py
@@@ -19,12 -19,14 +19,14 @@@ from bzrlib import ui, urlutil
  from bzrlib.branch import Branch, BranchFormat, BranchCheckResult, PullResult
  from bzrlib.bzrdir import BzrDir
  from bzrlib.errors import (NoSuchFile, DivergedBranches, NoSuchRevision, 
-                            NotBranchError, UnstackableBranchFormat)
+                            NoSuchTag, NotBranchError, UnstackableBranchFormat,
+                            UnrelatedBranches)
  from bzrlib.inventory import (Inventory)
  from bzrlib.revision import is_null, ensure_null, NULL_REVISION
+ from bzrlib.tag import BasicTags
  from bzrlib.workingtree import WorkingTree
  
 -from bzrlib.plugins.svn import core
 +from bzrlib.plugins.svn import core, wc
  from bzrlib.plugins.svn.auth import create_auth_baton
  from bzrlib.plugins.svn.client import Client, get_config
  from bzrlib.plugins.svn.commit import push
diff --cc commit.py
Simple merge
diff --cc errors.py
Simple merge
diff --cc repository.py
index 1fe36342fb004535c2583e8a4d5bb2b974e70510,3af21f361971610a73e7c2994ef09eaa11d77fc1..8cd990ebcb0913e99d3c93bf31dee6e677cafe9e
  """Subversion repository access."""
  
  import bzrlib
- from bzrlib import osutils, ui, urlutils, xml5
+ from bzrlib import osutils, ui, urlutils, xml7
  from bzrlib.branch import Branch, BranchCheckResult
  from bzrlib.errors import (InvalidRevisionId, NoSuchRevision, NotBranchError, 
 -                           UninitializableFormat, UnrelatedBranches)
 +                           UninitializableFormat, UnrelatedBranches, 
 +                           NotWriteLocked)
  from bzrlib.graph import CachingParentsProvider
  from bzrlib.inventory import Inventory
  from bzrlib.lockable_files import LockableFiles, TransportLock
index 7e9b25edfdb93a69c5e044b7337d31040e664d2b,e8432d0d8c2d4221823b58bad165100f6770f8a7..3f2782bdf4d7a13c995d56bf68405ce233937ca6
@@@ -587,10 -633,8 +633,10 @@@ class RevpropTests(TestCaseWithSubversi
          set_svn_revprops(transport, 1, {"svn:author": "Somebody", 
                                          "svn:date": time_to_cstring(1000000*473385600)})
  
 +        self.assertEquals(1, transport.get_latest_revnum())
 +
          self.assertEquals(("Somebody", "1985-01-01T00:00:00.000000Z", "My commit"), 
-                 self.client_log(repos_url)[1][1:])
+                           self.client_log(repos_url, 1, 1)[1][1:])
  
      def test_change_revprops_disallowed(self):
          repos_url = self.make_repository("d", allow_revprop_changes=False)
diff --cc tree.py
Simple merge
diff --cc workingtree.py
Simple merge