/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: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/changelog_merge.py
150
150
 
151
151
 
152
152
def merge_entries(base_entries, this_entries, other_entries,
153
 
        guess_edits=default_guess_edits):
 
153
                  guess_edits=default_guess_edits):
154
154
    """Merge changelog given base, this, and other versions."""
155
155
    m3 = Merge3(base_entries, this_entries, other_entries, allow_objects=True)
156
156
    result_entries = []
199
199
            else:
200
200
                result_entries.extend(new_in_other)
201
201
            result_entries.extend(updated_this)
202
 
        else: # unchanged, same, a, or b.
 
202
        else:  # unchanged, same, a, or b.
203
203
            lines = group[1]
204
204
            result_entries.extend(lines)
205
205
        at_top = False