← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-02-22 06:53:17 UTC
  • mfrom: (3228.1.3 bzr.preview-symlink)
  • Revision ID: pqm@pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
merge --preview now works for merges that add or modify symlinks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1407
1407
        name = self._transform._limbo_name(trans_id)
1408
1408
        return open(name, 'rb')
1409
1409
 
 
1410
    def get_symlink_target(self, file_id):
 
1411
        """See Tree.get_symlink_target"""
 
1412
        trans_id = self._transform.trans_id_file_id(file_id)
 
1413
        name = self._transform._limbo_name(trans_id)
 
1414
        return os.readlink(name)
 
1415
 
1410
1416
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
1411
1417
        """See Tree.paths2ids"""
1412
1418
        return 'not_empty'