/breezy-svn/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-svn/trunk

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-07 16:52:47 UTC
  • Revision ID: jelmer@jelmer.uk-20180607165247-gmzhdunriv9snkwj
Fix two more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1117
1117
                                      file_id, ie):
1118
1118
        already_there = (
1119
1119
            old_path == new_path and
1120
 
            base_tree.kind(file_id) == ie.kind)
 
1120
            base_tree.kind(old_path) == ie.kind)
1121
1121
        if old_path is not None:
1122
1122
            old_abspath = osutils.safe_utf8(self.abspath(old_path))
1123
1123
            if not already_there: