← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Fix WorkingTree4._iter_changes with pending merges and deleted files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1945
1945
                # implementation will do.
1946
1946
                if not osutils.is_inside_any(searched_specific_files, target_details[1]):
1947
1947
                    search_specific_files.add(target_details[1])
1948
 
            elif source_minikind in 'r' and target_minikind in 'r':
 
1948
            elif source_minikind in 'ra' and target_minikind in 'ra':
1949
1949
                # neither of the selected trees contain this file,
1950
1950
                # so skip over it. This is not currently directly tested, but
1951
1951
                # is indirectly via test_too_much.TestCommands.test_conflicts.