← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:15:02 UTC
  • mfrom: (1092.2.28)
  • Revision ID: robertc@robertcollins.net-20051003011502-f579a509a136b774
merge from baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
184
184
               rev.committer,
185
185
               len(rev.parent_ids))
186
186
        self._copy_new_texts(rev_id, inv)
187
 
        self._copy_inventory(rev_id, inv_xml, rev.parent_ids)
188
 
        self._copy_ancestry(rev_id, rev.parent_ids)
 
187
        parents = rev.parent_ids
 
188
        for parent in parents:
 
189
            if not self.to_branch.has_revision(parent):
 
190
                parents.pop(parents.index(parent))
 
191
        self._copy_inventory(rev_id, inv_xml, parents)
 
192
        self._copy_ancestry(rev_id, parents)
189
193
        self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
190
194
 
191
195
 
208
212
        for path, ie in inv.iter_entries():
209
213
            if ie.kind != 'file':
210
214
                continue
211
 
            if ie.text_version != rev_id:
 
215
            if ie.revision != rev_id:
212
216
                continue
213
217
            mutter('%s {%s} is changed in this revision',
214
218
                   path, ie.file_id)