Rev 1127: Fix tests. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1127
revision-id: jelmer at samba.org-20080825020224-ekc7g1y7p9w1tkr9
parent: jelmer at samba.org-20080825015811-qhszul4a980u58ph
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-08-25 04:02:24 +0200
message:
  Fix tests.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'branch.py'
--- a/branch.py	2008-08-25 01:58:11 +0000
+++ b/branch.py	2008-08-25 02:02:24 +0000
@@ -243,7 +243,7 @@
         """
         bp = self._branch_path.strip("/")
         if self._branch_path == "":
-            return None
+            return self.base.split("/")[-1]
         return bp
 
     nick = property(_get_nick)

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-25 01:58:11 +0000
+++ b/workingtree.py	2008-08-25 02:02:24 +0000
@@ -36,7 +36,7 @@
 from bzrlib.plugins.svn.client import Client
 from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
 from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, NotSvnBranchPath
+from bzrlib.plugins.svn.errors import ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, NotSvnBranchPath
 from bzrlib.plugins.svn.format import get_rich_root_format
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS, 
                      SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,