[Pkg-bazaar-commits] ./bzr-gtk/unstable r136: Merge from integration branch.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 136
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Tue 2007-01-30 11:12:34 +0100
message:
  Merge from integration branch.
modified:
  olive/push.py
    ------------------------------------------------------------
    revno: 126.1.6
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bzr-gtk
    timestamp: Tue 2007-01-30 00:44:11 +0100
    message:
      Merge from trunk.
    added:
      olive/errors.py
    modified:
      olive/__init__.py
      olive/commit.py
      olive/menu.py
      olive/merge.py
      olive/mkdir.py
      olive/move.py
      olive/push.py
      olive/remove.py
      olive/rename.py
    ------------------------------------------------------------
    revno: 126.1.7
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bzr-gtk
    timestamp: Tue 2007-01-30 00:56:33 +0100
    message:
      Merge from trunk.
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 126.1.8
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bzr-gtk
    timestamp: Tue 2007-01-30 11:08:36 +0100
    message:
      Merge from trunk.
    modified:
      __init__.py
      olive/__init__.py
      olive/commit.py
    ------------------------------------------------------------
    revno: 126.1.9
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bzr-gtk
    timestamp: Tue 2007-01-30 11:11:47 +0100
    message:
      Trivial regression fix.
    modified:
      olive/push.py
-------------- next part --------------
=== modified file 'olive/push.py'
--- a/olive/push.py	2007-01-29 23:27:09 +0000
+++ b/olive/push.py	2007-01-30 10:11:47 +0000
@@ -102,6 +102,7 @@
         if self.radio_stored.get_active():
             try:
                 revs = do_push(self.branch,
+                               overwrite=self.check_overwrite.get_active())
             except errors.DivergedBranches:
                 response = question_dialog(_('Branches have been diverged'),
                              _('You cannot push if branches have diverged. \nOverwrite?'))