/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/changelog_merge/changelog_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/changelog_merge.py
24
24
    debug,
25
25
    merge,
26
26
    osutils,
27
 
    urlutils,
28
27
    )
29
28
from ...merge3 import Merge3
30
29
from ...trace import mutter
151
150
 
152
151
 
153
152
def merge_entries(base_entries, this_entries, other_entries,
154
 
        guess_edits=default_guess_edits):
 
153
                  guess_edits=default_guess_edits):
155
154
    """Merge changelog given base, this, and other versions."""
156
155
    m3 = Merge3(base_entries, this_entries, other_entries, allow_objects=True)
157
156
    result_entries = []
200
199
            else:
201
200
                result_entries.extend(new_in_other)
202
201
            result_entries.extend(updated_this)
203
 
        else: # unchanged, same, a, or b.
 
202
        else:  # unchanged, same, a, or b.
204
203
            lines = group[1]
205
204
            result_entries.extend(lines)
206
205
        at_top = False