/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/news_merge/parser.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/news_merge/parser.py
36
36
 
37
37
def simple_parse(content):
38
38
    """Returns blocks, where each block is a 2-tuple (kind, text).
39
 
    
 
39
 
40
40
    :kind: one of 'heading', 'release', 'section', 'empty' or 'text'.
41
41
    :text: a str, including newlines.
42
42
    """