← 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: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

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
 
19
21
 
20
22
from bzrlib.plugins.news_merge.parser import simple_parse_lines
21
23
from bzrlib import merge, merge3
28
30
 
29
31
    def merge_text(self, params):
30
32
        """Perform a simple 3-way merge of a bzr NEWS file.
31
 
        
 
33
 
32
34
        Each section of a bzr NEWS file is essentially an ordered set of bullet
33
35
        points, so we can simply take a set of bullet points, determine which
34
36
        bullets to add and which to remove, sort, and reserialize.