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

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_pull.py
99
99
        self.assertEqual('P1', result.old_revid)
100
100
        self.assertEqual(2, result.new_revno)
101
101
        self.assertEqual('M1', result.new_revid)
102
 
        self.assertEqual(None, result.tag_conflicts)
 
102
        self.assertEqual([], result.tag_conflicts)
103
103
 
104
104
    def test_pull_overwrite(self):
105
105
        tree_a = self.make_from_branch_and_tree('tree_a')