← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-11 04:20:56 UTC
  • mfrom: (3490.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080611042056-m5e074q47s9gwwjj
(mbp) \#212289 avoid assuming Windows diff tools can understand
        symlinks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
717
717
        return proc.wait()
718
718
 
719
719
    def _try_symlink_root(self, tree, prefix):
720
 
        if not (getattr(tree, 'abspath', None) is not None
721
 
                and osutils.has_symlinks()):
 
720
        if (getattr(tree, 'abspath', None) is None
 
721
            or not osutils.host_os_dereferences_symlinks()):
722
722
            return False
723
723
        try:
724
724
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))