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

  • Committer: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
29
29
import bzrlib.errors as errors
30
30
 
31
31
from dialog import error_dialog, info_dialog, warning_dialog
32
 
from guifiles import GLADEFILENAME
 
32
from errors import show_bzr_error
 
33
from olive.guifiles import GLADEFILENAME
33
34
 
34
35
 
35
36
class MergeDialog:
58
59
        """ Display the Add file(s) dialog. """
59
60
        self.window.show_all()
60
61
 
 
62
    @show_bzr_error
61
63
    def merge(self, widget):
62
64
        branch = self.entry.get_text()
63
65
        if branch == "":
65
67
                         _('Please specify a branch to merge from.'))
66
68
            return
67
69
 
68
 
        try:
69
 
            other_branch = Branch.open_containing(branch)[0]
70
 
        except errors.NotBranchError:
71
 
            error_dialog(_('Specified location not a branch'),
72
 
                         _('Please specify a branch you want to merge from.'))
73
 
            return
74
 
        
 
70
        other_branch = Branch.open_containing(branch)[0]
 
71
 
75
72
        try:
76
73
            conflicts = self.wt.merge_from_branch(other_branch)
77
74
        except errors.BzrCommandError, errmsg: