← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-22 22:14:56 UTC
  • mfrom: (3946.2.2 add-rec)
  • Revision ID: pqm@pqm.ubuntu.com-20090122221456-p57kr0fane0s4iv8
(Jelmer) Don't require the present compression base in knits to be
        the same when adding records in knits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_knit.py
1529
1529
        index = self.two_graph_index(deltas=True, catch_adds=True)
1530
1530
        # change options
1531
1531
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1532
 
            [(('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1533
 
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1534
 
            [(('tip',), 'line-delta,no-eol', (None, 0, 100), [('parent',)])])
 
1532
            [(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1535
1533
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1536
1534
            [(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1537
1535
        # parents
1591
1589
        index = self.two_graph_index(deltas=True, catch_adds=True)
1592
1590
        # change options
1593
1591
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1594
 
            [(('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1595
 
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1596
 
            [(('tip',), 'line-delta,no-eol', (None, 0, 100), [('parent',)])])
 
1592
            [(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1597
1593
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1598
1594
            [(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1599
1595
        # parents
1602
1598
        # change options in the second record
1603
1599
        self.assertRaises(errors.KnitCorrupt, index.add_records,
1604
1600
            [(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1605
 
             (('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
 
1601
             (('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1606
1602
        self.assertEqual([], self.caught_entries)
1607
1603
 
1608
1604