Rev 2446: additional fix for subtree comparison in file:///home/mbp/bzr/Work/subtree/

[Martin Pool]

------------------------------------------------------------
revno: 2446
revision-id: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
parent: mbp at sourcefrog.net-20070305064503-mf6hwihhvgnf88wg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 17:45:21 +1100
message:
  additional fix for subtree comparison
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-05 06:30:46 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-05 06:45:21 +0000
@@ -1711,7 +1711,7 @@
             else:
                 link_or_sha1 = None
             source_minikind = source_details[0]
-            if source_minikind in 'fdlr' and target_minikind in 'fdl':
+            if source_minikind in 'fdltr' and target_minikind in 'fdlt':
                 # claimed content in both: diff
                 #   r    | fdlt   |      | add source to search, add id path move and perform
                 #        |        |      | diff check on source-target