Rev 516: Merge fix for import in Olive. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 516
revision-id: jelmer at samba.org-20080629222939-vitjz207o7grwdti
parent: jelmer at samba.org-20080629222903-ihamc1mifd2zs5xu
parent: jelmer at samba.org-20080628165950-18kv7bdykgf1f1jf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-06-30 00:29:39 +0200
message:
  Merge fix for import in Olive.
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  olive/move.py                  move.py-20060809140408-txw8f17jvqykh0iv-1
    ------------------------------------------------------------
    revno: 511.2.1
    revision-id: jelmer at samba.org-20080628165950-18kv7bdykgf1f1jf
    parent: jelmer at samba.org-20080628154539-l5lkvs5qwuf2zx1m
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-06-28 18:59:50 +0200
    message:
      Fix import in olive.
    modified:
      olive/move.py                  move.py-20060809140408-txw8f17jvqykh0iv-1
=== modified file 'NEWS'
--- a/NEWS	2008-06-29 22:29:03 +0000
+++ b/NEWS	2008-06-29 22:29:39 +0000
@@ -14,6 +14,8 @@
 
   * Fixed handle-patch script. (Jelmer Vernooij)
 
+  * Fix import in olive. (Jelmer Vernooij, #223935)
+
  CHANGES
 
   * Moved notify icon code to separate script. (Jelmer Vernooij)

=== modified file 'olive/move.py'
--- a/olive/move.py	2008-05-05 18:16:46 +0000
+++ b/olive/move.py	2008-06-28 16:59:50 +0000
@@ -31,7 +31,7 @@
 
 from bzrlib.plugins.gtk import _i18n
 from bzrlib.plugins.gtk.dialog import error_dialog
-from errors import show_bzr_error
+from bzrlib.plugins.gtk.errors import show_bzr_error
 from guifiles import GLADEFILENAME