Warning! Highly trivial patch ahead.

Jasper
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: 9250572b4f9df82e37b76e7e6a641744413bcbe9
# timestamp: 2008-07-18 17:00:33 +0200
# source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'olive/__init__.py'
--- olive/__init__.py	2008-07-18 12:35:47 +0000
+++ olive/__init__.py	2008-07-18 15:00:20 +0000
@@ -1,5 +1,3 @@
- #!/usr/bin/python
-
 # Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[EMAIL PROTECTED]>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -659,7 +657,7 @@
     @show_bzr_error
     def on_menuitem_branch_revert_activate(self, widget):
         """ Branch/Revert all changes menu handler. """
-        ret = self.wt.revert([])
+        ret = self.wt.revert(None)
         if ret:
             warning_dialog(_i18n('Conflicts detected'),
                            _i18n('Please have a look at the working tree before continuing.'))
@@ -1511,8 +1509,6 @@
             if sys.platform == 'win32':
                 print "pyWin32 modules needed to run Olive on Win32."
                 sys.exit(1)
-            else:
-                pass
         
         driveletters = []
         for drive in string.ascii_uppercase:
@@ -1756,4 +1752,3 @@
                 return self._get_default(option)
             except KeyError:
                 return None
- 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVjzPI8AAZTfgAQQeWP//1qR
FAq////wUAO5c969Ae9Yed7wShJTR6aaanpM2k9Q1HkanqHqA0xA0ASSmmpPGFT0jajTBAyYgABk
GgZEJiAGqPEQAAGgDE00aBJJMmkj2SnqPSekaeppoAHqAMgAEkhNJkwBGmlP1GT1NT0mjTIZNAyN
FszyoX5tF+MnFAhoSMH0ty+nPghOU6LlW2wt0aYSGg3oG+x2SfUoWlYIxih2yFHqmmrc1QuZ7MGK
fjrUDLKgb45KtX5c986zOzXK06DGVkQ0/C0ouTmXdMaD3imI8yKKQtNqjg8gBrWsNpXWlMtE3Yoi
csRM5RmJ7UNeJkLEcQFSybdQnCHDy7krFsKph7PMH7hFdWsIWuspPA7hxsLNUoqiBDdd+TveI6+g
aU2DzmKcIUD1MUbKUKmqVFTLASvm5MUhaSldN5WWjOcXyxGLBxlioiepbAZP2S9BQNWdgHaVk5kL
iG2ngFSg1h69yZml9zR1PmzzYYl4ZuWkOmMhcBgMTEeUGNMa6ki7AaUoWtZGy02ky/i9a5ICMU4H
sKqcuCjC81F76Ss1TE66jnmX7mxHOLi0qoKCJQQNHbhTDF3XvtpIRpYYqUJjAJOBN8ziwu9jL3RI
lrYWDux4cPEwpfFxFnP1LMCmCZm82Ko+Q9WO9O4LQjWzT1KEgPB9XKyJ0p5tGMDA2bT2xAeU0D0O
0yAgqyqNHKYX7b+rPnwKDd8eQ50qgcwIR4IlHF5SAze12D28aek1ptNIzqmcTKkdmSIzPeSzVcxP
PPceHe9jGKNFIXjbIFlUeuoxGTDrWWILJbTY+WPDfOmqzFb34p3xvTInmGy2ZVXFUhnIQVTSE5Is
en2woXaJSZxNBEOOslPWunGqPLXTptasSe8+Vtr1CUNmHpT1eNyz9jiXl0Pqhio3rB5j9w13ag8t
8I3gVAUh26TkjdK79p2iyOVgXzp6oAnA1rI+AGi49bnk6D6SBpM/oUiHrwymoavRUUKbAdGAGRJi
oBBXReSXuDzAtkB7IZcOBAV5uA31OlA/x3RFqCCsXa5VW4E5s3FIw4eNOvD6kWcHDerrGmEx9zK5
g7wIBbRHNvC/LFHonNk6CjXQo7nRQ9D2GV/R2AXwyDNA/VplmVZgA0VXkuGVKOeijgXMvMWjunEk
HRIXo2x1wfbXWGgRAnPCxS1DBR38nnNEGNlBiJy4+QoF0hDsFP7kxUljD0zoukDAmV9SN6CM50Og
wUTJD/F3JFOFCQWPM8jw

Attachment: signature.asc
Description: OpenPGP digital signature

-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to