← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/news_merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/news_merge.py
16
16
 
17
17
"""Merge logic for news_merge plugin."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
 
22
20
from bzrlib.plugins.news_merge.parser import simple_parse_lines
23
21
from bzrlib import merge, merge3
30
28
 
31
29
    def merge_text(self, params):
32
30
        """Perform a simple 3-way merge of a bzr NEWS file.
33
 
 
 
31
        
34
32
        Each section of a bzr NEWS file is essentially an ordered set of bullet
35
33
        points, so we can simply take a set of bullet points, determine which
36
34
        bullets to add and which to remove, sort, and reserialize.