Rev 1087: Merge error improvements. in file:///data/jelmer/bzr-svn/cext/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1087
revision-id: jelmer at samba.org-20080605174124-olk2dj0tkdcms8b1
parent: jelmer at samba.org-20080605173437-aj6yq3ruicymv351
parent: jelmer at samba.org-20080605173943-whodsmk0029hq46v
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 19:41:24 +0200
message:
  Merge error improvements.
modified:
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
    ------------------------------------------------------------
    revno: 950.3.153
    revision-id: jelmer at samba.org-20080605173943-whodsmk0029hq46v
    parent: jelmer at samba.org-20080605172628-h99zhrgfr7tggflq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-05 19:39:43 +0200
    message:
      Remove absolute path references to SubversionException.
    modified:
      config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
=== modified file 'convert.py'
--- a/convert.py	2008-06-04 18:56:53 +0000
+++ b/convert.py	2008-06-05 17:41:24 +0000
@@ -24,8 +24,8 @@
 from bzrlib.transport import get_transport
 
 from bzrlib.plugins.svn.format import get_rich_root_format
-
-import core, repos, constants
+from bzrlib.plugins.svn import core, repos, constants
+from bzrlib.plugins.svn.core import SubversionException
 
 def transport_makedirs(transport, location_url):
     """Create missing directories.
@@ -72,7 +72,7 @@
         file = open(dumpfile)
     try:
         r.load_fs(file, StringIO(), repos.LOAD_UUID_DEFAULT)
-    except core.SubversionException, (_, num):
+    except SubversionException, (_, num):
         if num == constants.ERR_STREAM_MALFORMED_DATA:
             raise NotDumpFile(dumpfile)
         raise

=== modified file 'revids.py'
--- a/revids.py	2008-06-05 17:05:57 +0000
+++ b/revids.py	2008-06-05 17:41:24 +0000
@@ -21,6 +21,7 @@
 from bzrlib.trace import mutter
 
 from bzrlib.plugins.svn import core
+from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.cache import CacheTable
 from bzrlib.plugins.svn.errors import InvalidPropertyValue
 from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,