/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 python3.passing

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-31 05:19:43 UTC
  • mfrom: (7078.8.1 fix-changelog-merge)
  • Revision ID: breezy.the.bot@gmail.com-20180831051943-bhz0mc4xbzq4ll9w
Fix changelog merge tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/fix-changelog-merge/+merge/353609

Show diffs side-by-side

added added

removed removed

Lines of Context:
python3.passing
343
343
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_default_guess_edits
344
344
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_more_complex_conflict
345
345
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_new_in_other_floats_to_top
 
346
breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_too_hard
346
347
breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_added_NEWS
347
348
breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_changed_NEWS
348
349
breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_fix_bug