← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

merge aaron's empty merge directive fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
93
93
            if line.startswith('# ' + klass._format_string):
94
94
                break
95
95
        else:
96
 
            raise errors.NotAMergeDirective(lines[0])
 
96
            if len(lines) > 0:
 
97
                raise errors.NotAMergeDirective(lines[0])
 
98
            else:
 
99
                raise errors.NotAMergeDirective('')
97
100
        stanza = rio.read_patch_stanza(line_iter)
98
101
        patch_lines = list(line_iter)
99
102
        if len(patch_lines) == 0: