← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/export/zip_exporter.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/export/zip_exporter.py
99
99
                            date_time=date_time)
100
100
                zinfo.compress_type = compression
101
101
                zinfo.external_attr = _FILE_ATTR
102
 
                zipf.writestr(zinfo, ie.symlink_target)
 
102
                zipf.writestr(zinfo, tree.get_symlink_target(file_id))
103
103
 
104
104
        zipf.close()
105
105