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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-04 00:08:59 UTC
  • mfrom: (7122.6.12 win-symlink-warning)
  • Revision ID: breezy.the.bot@gmail.com-20190604000859-2xwms4tkctrj83dm
Allow symbolic links to exist when checking out trees on Windows.

Merged from https://code.launchpad.net/~jelmer/brz/win-symlink-warning/+merge/363900

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
1050
1050
            # is, missing) in both trees are skipped as well.
1051
1051
            if parent == (None, None) or kind == (None, None):
1052
1052
                continue
 
1053
            if kind[0] == 'symlink' and not self.new_tree.supports_symlinks():
 
1054
                warning(
 
1055
                    'Ignoring "%s" as symlinks are not '
 
1056
                    'supported on this filesystem.' % (paths[0],))
 
1057
                continue
1053
1058
            oldpath, newpath = paths
1054
1059
            oldpath_encoded = get_encoded_path(paths[0])
1055
1060
            newpath_encoded = get_encoded_path(paths[1])