/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-01 23:16:11 UTC
  • mfrom: (0.200.904 trunk)
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100501231611-t8hh69jq6krevlwi
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
127
127
            ie.text_sha1 = osutils.sha_strings(blob.chunked)
128
128
    # Check what revision we should store
129
129
    parent_keys = []
130
 
    for pinv in parent_invs[1:]:
 
130
    for pinv in parent_invs:
131
131
        try:
132
132
            pie = pinv[file_id]
133
133
        except NoSuchId:
136
136
            # found a revision in one of the parents to use
137
137
            ie.revision = pie.revision
138
138
            break
139
 
        parent_keys.append((file_id, pie.revision))
 
139
        parent_key = (file_id, pie.revision)
 
140
        if not parent_key in parent_keys:
 
141
            parent_keys.append(parent_key)
140
142
    if ie.revision is None:
141
143
        # Need to store a new revision
142
144
        ie.revision = revision_id