/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/test_versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-12-04 03:36:03 UTC
  • mfrom: (3073 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071204033603-equ8y41vfk8vkway
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
821
821
        self.plan_merge_vf.add_lines('C:', ['B'], [])
822
822
        self.plan_merge_vf.add_lines('D:', ['C:'], [])
823
823
        self.assertEqual(set(['A', 'B', 'C:', 'D:']),
824
 
            self.plan_merge_vf.get_ancestry('D:'))
 
824
            self.plan_merge_vf.get_ancestry('D:', topo_sorted=False))
825
825
 
826
826
    def setup_abcde(self):
827
827
        self.vf1.add_lines('A', [], ['a'])
833
833
    def test_ancestry_uses_all_versionedfiles(self):
834
834
        self.setup_abcde()
835
835
        self.assertEqual(set(['A', 'B', 'C', 'D', 'E:']),
836
 
            self.plan_merge_vf.get_ancestry('E:'))
 
836
            self.plan_merge_vf.get_ancestry('E:', topo_sorted=False))
837
837
 
838
838
    def test_ancestry_raises_revision_not_present(self):
839
839
        error = self.assertRaises(errors.RevisionNotPresent,
840
 
                                  self.plan_merge_vf.get_ancestry, 'E:')
 
840
                                  self.plan_merge_vf.get_ancestry, 'E:', False)
841
841
        self.assertContainsRe(str(error), '{E:} not present in "root"')
842
842
 
843
843
    def test_get_parents(self):