/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

Properly set InventoryEntry revision when changing symlink targets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
130
130
    else:
131
131
        blob = lookup_object(hexsha)
132
132
        if ie.kind == "symlink":
 
133
            ie.revision = None
133
134
            ie.symlink_target = blob.data
134
135
            ie.text_size = None
135
136
            ie.text_sha1 = None
148
149
                pie = pinv[file_id]
149
150
            except NoSuchId:
150
151
                continue
151
 
        if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable:
 
152
        if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
152
153
            # found a revision in one of the parents to use
153
154
            ie.revision = pie.revision
154
155
            break