Rev 2451: Handle the source and target paths both being relocated from another path in the tree - this is possible with a pending merge. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2451
revision-id: robertc at robertcollins.net-20070301025530-4yx1nlo3ze29bajg
parent: robertc at robertcollins.net-20070301023547-g7w3o81gwczes50y
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Thu 2007-03-01 13:55:30 +1100
message:
  Handle the source and target paths both being relocated from another path in the tree - this is possible with a pending merge.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-01 02:01:31 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-01 02:55:30 +0000
@@ -1712,7 +1712,13 @@
                 # implementation will do.
                 if not osutils.is_inside_any(searched_specific_files, target_details[1]):
                     search_specific_files.add(target_details[1])
+            elif source_minikind in 'r' and target_minikind in 'r':
+                # neither of the selected trees contain this file,
+                # so skip over it. This is not currently directly tested, but
+                # is indirectly via test_too_much.TestCommands.test_conflicts.
+                pass
             else:
+                print "*******", source_minikind, target_minikind
                 import pdb;pdb.set_trace()
             return ()
         while search_specific_files: