← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

Test inserting a stream that overlaps the current content of a knit does not error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
349
349
                    adapters[adapter_key] = adapter
350
350
                lines = split_lines(adapter.get_bytes(
351
351
                    record, record.get_bytes_as(record.storage_kind)))
352
 
                self.add_lines(record.key[0], parents, lines)
 
352
                try:
 
353
                    self.add_lines(record.key[0], parents, lines)
 
354
                except RevisionAlreadyPresent:
 
355
                    pass
353
356
 
354
357
    def _check_repeated_add(self, name, parents, text, sha1):
355
358
        """Check that a duplicated add is OK.