← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2006-09-26 23:15:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2045.
  • Revision ID: robertc@robertcollins.net-20060926231500-ae7480f138254f17
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2384
2384
 
2385
2385
        # In this revision format, root entries have no knit or weave
2386
2386
        if ie is self.new_inventory.root:
2387
 
            if len(parent_invs):
2388
 
                ie.revision = parent_invs[0].root.revision
2389
 
            else:
2390
 
                ie.revision = None
 
2387
            # When serializing out to disk and back in
 
2388
            # root.revision is always _new_revision_id
 
2389
            ie.revision = self._new_revision_id
2391
2390
            return
2392
2391
        previous_entries = ie.find_previous_heads(
2393
2392
            parent_invs,