/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 bzr-handle-patch

  • Committer: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
25
25
        try:
26
26
                directive = merge_directive.MergeDirective.from_lines(lines)
27
27
        except errors.NotAMergeDirective:
28
 
                controller = DiffController(path, lines)
 
28
                controller = DiffController(path, lines, allow_dirty=True)
29
29
        else:
30
30
                controller = MergeDirectiveController(path, directive)
31
31
        window = controller.window
33
33
        gtk = open_display()
34
34
        window.connect("destroy", gtk.main_quit)
35
35
except Exception, e:
36
 
        from dialog import error_dialog
 
36
        from bzrlib.plugins.gtk.dialog import error_dialog
37
37
        error_dialog('Error', str(e))
38
38
        raise
39
39
gtk.main()