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

  • Committer: Vincent Ladeuil
  • Date: 2007-09-24 15:01:26 UTC
  • mfrom: (2853 +trunk)
  • mto: (2885.1.1 140432)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20070924150126-nll7i0385kisklyj
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
707
707
        eq(wa.get_lines('b1'),
708
708
           ['hello\n', 'pale blue\n', 'world\n'])
709
709
 
710
 
    def test_join_parent_disagreement(self):
711
 
        #join reconciles differening parents into a union.
712
 
        wa = Weave()
713
 
        wb = Weave()
714
 
        wa.add_lines('v1', [], ['hello\n'])
715
 
        wb.add_lines('v0', [], [])
716
 
        wb.add_lines('v1', ['v0'], ['hello\n'])
717
 
        wa.join(wb)
718
 
        self.assertEqual(['v0'], wa.get_parents('v1'))
719
 
 
720
710
    def test_join_text_disagreement(self):
721
711
        """Cannot join weaves with different texts for a version."""
722
712
        wa = Weave()