/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: Jelmer Vernooij
  • Date: 2011-02-18 11:53:18 UTC
  • mfrom: (452.5.2 viz-locks)
  • Revision ID: jelmer@samba.org-20110218115318-xgsxhn13fd3m6nj9
https://launchpad.net/bugs/93652
Add lock dialog. (Daniel Schierbeck)

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()