/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-12 09:58:01 UTC
  • mfrom: (7029.4.9 python3-merge)
  • Revision ID: breezy.the.bot@gmail.com-20180712095801-59ffq76qu4wou2ab
Fix some merge tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-merge/+merge/349097

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/changelog_merge.py
108
108
    pass
109
109
 
110
110
 
111
 
def default_guess_edits(new_entries, deleted_entries, entry_as_str=''.join):
 
111
def default_guess_edits(new_entries, deleted_entries, entry_as_str=b''.join):
112
112
    """Default implementation of guess_edits param of merge_entries.
113
113
 
114
114
    This algorithm does O(N^2 * logN) SequenceMatcher.ratio() calls, which is