← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Robert Collins
  • Date: 2006-03-01 12:09:59 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060301120959-b58a073b9f7f7a00
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
836
836
           ['hello\n', 'pale blue\n', 'world\n'])
837
837
 
838
838
    def test_join_parent_disagreement(self):
839
 
        """Cannot join weaves with different parents for a version."""
 
839
        #join reconciles differening parents into a union.
840
840
        wa = Weave()
841
841
        wb = Weave()
842
842
        wa.add('v1', [], ['hello\n'])
843
843
        wb.add('v0', [], [])
844
844
        wb.add('v1', ['v0'], ['hello\n'])
845
 
        self.assertRaises(WeaveError,
846
 
                          wa.join, wb)
 
845
        wa.join(wb)
 
846
        self.assertEqual(['v0'], wa.get_parents('v1'))
847
847
 
848
848
    def test_join_text_disagreement(self):
849
849
        """Cannot join weaves with different texts for a version."""