Rev 98: Merge trunk. in http://people.ubuntu.com/~robertc/baz2.0/plugins/rebase/dev

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/rebase/dev

------------------------------------------------------------
revno: 98
revision-id: robertc at robertcollins.net-20080718114356-lx2ymkdra6ie6a3s
parent: robertc at robertcollins.net-20080626081523-jq42aq5zx2hx5daj
parent: jelmer at samba.org-20080701022232-8loxbt0ppfxfy19o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dev
timestamp: Fri 2008-07-18 21:43:56 +1000
message:
  Merge trunk.
modified:
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
    ------------------------------------------------------------
    revno: 96.2.1
    revision-id: jelmer at samba.org-20080701022232-8loxbt0ppfxfy19o
    parent: jelmer at samba.org-20080623020428-ra3snuwqos2quw92
    parent: bialix at ukr.net-20080620185634-22vfc713ucipsnok
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2008-07-01 04:22:32 +0200
    message:
      Merge small import fix from Alexander.
    modified:
      __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
    ------------------------------------------------------------
    revno: 96.1.1
    revision-id: bialix at ukr.net-20080620185634-22vfc713ucipsnok
    parent: jelmer at samba.org-20080623020428-ra3snuwqos2quw92
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: rebase
    timestamp: Fri 2008-06-20 21:56:34 +0300
    message:
      Don't import Option from bzrlib/commands.py
    modified:
      __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
=== modified file '__init__.py'
--- a/__init__.py	2008-06-26 08:15:23 +0000
+++ b/__init__.py	2008-07-18 11:43:56 +0000
@@ -21,10 +21,11 @@
 'rebase-continue' command or abort using the 'rebase-abort' command.
 """
 
-from bzrlib.commands import Command, Option, display_command, register_command
+from bzrlib.commands import Command, display_command, register_command
 from bzrlib.errors import (BzrCommandError, ConflictsInTree, NoSuchFile, 
                            UnrelatedBranches, NoSuchRevision, 
                            UncommittedChanges)
+from bzrlib.option import Option
 from bzrlib.trace import info, warning
 
 version_info = (0, 4, 0, 'dev', 0)