/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 bzrlib/diff.py

  • Committer: Parth Malwankar
  • Date: 2012-02-20 07:33:24 UTC
  • mto: (7122.6.1 win-symlink-warning)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: parth.malwankar@gmail.com-20120220073324-3cq5imi9ruozcnf2
updated diff to ignore symlinks on windows

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
973
973
            # is, missing) in both trees are skipped as well.
974
974
            if parent == (None, None) or kind == (None, None):
975
975
                continue
 
976
            if kind[0] == 'symlink' and not osutils.has_symlinks():
 
977
                warning('Ignoring "%s" as symlinks are not supported on '
 
978
                    'this platform.' % (paths[0],))
 
979
                continue
976
980
            oldpath, newpath = paths
977
981
            oldpath_encoded = get_encoded_path(paths[0])
978
982
            newpath_encoded = get_encoded_path(paths[1])