← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
51
51
        br1, br2 = self.test_pending_with_null()
52
52
        commit(br1, "blah")
53
53
        last = br1.last_revision()
54
 
        self.assertEquals(common_ancestor(last, last, br1.storage), last)
 
54
        self.assertEquals(common_ancestor(last, last, br1.repository), last)
55
55
 
56
56
    def test_create_rename(self):
57
57
        """Rename an inventory entry while creating the file"""