/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 diff.py

  • Committer: Aaron Bentley
  • Date: 2008-05-10 03:23:00 UTC
  • mto: This revision was merged to the branch mainline in revision 492.
  • Revision ID: aaron@aaronbentley.com-20080510032300-v7mdhm2zae04o356
Add more merge tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
474
474
        info_dialog(_('Merge successful'),
475
475
                    _('All changes applied successfully.'))
476
476
 
 
477
    def _conflicts(self):
 
478
        warning_dialog(_('Conflicts encountered'),
 
479
                       _('Please resolve the conflicts manually'
 
480
                         ' before committing.'))
 
481
 
 
482
 
477
483
    def _get_save_path(self, basename):
478
484
        d = gtk.FileChooserDialog('Save As', self,
479
485
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
572
578
                if conflict_count == 0:
573
579
                    self.window._merge_successful()
574
580
                else:
 
581
                    self.window._conflicts()
575
582
                    # There are conflicts to be resolved.
576
 
                    warning_dialog(_('Conflicts encountered'),
577
 
                                   _('Please resolve the conflicts manually'
578
 
                                     ' before committing.'))
579
583
                self.window.destroy()
580
584
            except Exception, e:
581
585
                error_dialog('Error', str(e))