~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

additional fix for subtree comparison

Show diffs side-by-side

added added

removed removed

Lines of Context:
1711
1711
            else:
1712
1712
                link_or_sha1 = None
1713
1713
            source_minikind = source_details[0]
1714
 
            if source_minikind in 'fdlr' and target_minikind in 'fdl':
 
1714
            if source_minikind in 'fdltr' and target_minikind in 'fdlt':
1715
1715
                # claimed content in both: diff
1716
1716
                #   r    | fdlt   |      | add source to search, add id path move and perform
1717
1717
                #        |        |      | diff check on source-target