← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Robert Collins
  • Date: 2006-03-14 10:27:28 UTC
  • mto: (1615.1.2 bzr.mbp.integration)
  • mto: This revision was merged to the branch mainline in revision 1616.
  • Revision ID: robertc@robertcollins.net-20060314102728-7e47b9b8cd6c3d73
rollback from using deltas to using fulltexts - deltas need more work to be ready.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
300
300
            assert len(delta) == 1 or len(delta) == 0
301
301
            if len(delta):
302
302
                assert delta[0][0] == 0
303
 
                assert delta[0][1] == 0
 
303
                assert delta[0][1] == 0, delta[0][1]
304
304
            return super(KnitVersionedFile, self)._add_delta(version_id,
305
305
                                                             parents,
306
306
                                                             delta_parent,
563
563
            content._lines[-1] = (content._lines[-1][0], line)
564
564
 
565
565
        if sha_strings(content.text()) != digest:
566
 
            raise KnitCorrupt(self.filename, 'sha-1 does not match')
 
566
            import pdb;pdb.set_trace()
 
567
            raise KnitCorrupt(self.filename, 'sha-1 does not match %s' % version_id)
567
568
 
568
569
        return content
569
570