/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: Toshio Kuratomi
  • Date: 2010-04-13 15:06:17 UTC
  • mto: This revision was merged to the branch mainline in revision 693.
  • Revision ID: toshio@fedoraproject.org-20100413150617-e37qx1qgdewh0n8o
Fix bzr-handle-patch to process patches with leading and trailing comments with
newer bzrlib.

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