/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to bzr-handle-patch

• browse files at revision 699.2.8
• compare with another revision
• download diff
• download tarball
• view history from revision 699.2.8

• reverse the comparison (699.2.8 to 511.5.5)
• stop comparing with revision 511.5.5

Show diffs side-by-side

added

removed

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

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0