← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

  • Committer: Gordon Tyler
  • Date: 2011-01-21 23:51:15 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20110121235115-9sdqamejot1h0481
Replace usage of format function from python 2.6 with our own very simple formatting function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
321
321
                             ], d_tree)
322
322
        # Because we copied the exact text into *this* tree, the 'c' file
323
323
        # should look like it was not modified in the merge
324
 
        self.assertEqual('C-id', d_tree.get_file_revision('c-id'))
 
324
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
325
325
 
326
326
    def test_set_parent_to_null(self):
327
327
        builder = self.build_a_rev()