/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/push.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-01-30 10:12:34 UTC
  • mfrom: (126.1.9 bzr-gtk)
  • Revision ID: szilveszter.farkas@gmail.com-20070130101234-aju6xbjbo4c934zz
Merge from integration branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
102
102
        if self.radio_stored.get_active():
103
103
            try:
104
104
                revs = do_push(self.branch,
 
105
                               overwrite=self.check_overwrite.get_active())
105
106
            except errors.DivergedBranches:
106
107
                response = question_dialog(_('Branches have been diverged'),
107
108
                             _('You cannot push if branches have diverged. \nOverwrite?'))