/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/tests/per_branch/test_pull.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-21 04:40:09 UTC
  • mfrom: (7494.1.1 trunk-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200221044009-cijpllwtz5ql9tar
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-3.1/+merge/379600

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_pull.py
118
118
        self.assertEqual(p1, result.old_revid)
119
119
        self.assertEqual(2, result.new_revno)
120
120
        self.assertEqual(m1, result.new_revid)
121
 
        self.assertEqual([], result.tag_conflicts)
 
121
        self.assertEqual([], list(result.tag_conflicts))
122
122
 
123
123
    def test_pull_overwrite(self):
124
124
        tree_a = self.make_branch_and_tree('tree_a')