Rev 1180: Fix import of rebase check function. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1180
revision-id: jelmer at samba.org-20080523113212-blhfdd5u5nbjq6ee
parent: jelmer at samba.org-20080521194016-ijaq8upw7jq4ptll
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-05-23 13:32:12 +0200
message:
  Fix import of rebase check function.
modified:
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'upgrade.py'
--- a/upgrade.py	2008-05-18 14:34:26 +0000
+++ b/upgrade.py	2008-05-23 11:32:12 +0000
@@ -124,6 +124,7 @@
         of revisions.
     :return: Tuple with a rebase plan and map of renamed revisions.
     """
+    from bzrlib.plugins.svn import check_rebase_version
     from bzrlib.plugins.rebase.rebase import generate_transpose_plan
     check_rebase_version(MIN_REBASE_VERSION)
 
@@ -169,6 +170,7 @@
     :param verbose: Whether to print list of rewrites
     :return: Dictionary of mapped revisions
     """
+    from bzrlib.plugins.svn import check_rebase_version
     check_rebase_version(MIN_REBASE_VERSION)
     from bzrlib.plugins.rebase.rebase import (
         replay_snapshot, rebase, rebase_todo)