Rev 3524: A mix-matched commit with things moving in each tree. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/multi_walker

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/multi_walker

------------------------------------------------------------
revno: 3524
revision-id: john at arbash-meinel.com-20080630232157-j38i11dq21da6ewo
parent: john at arbash-meinel.com-20080630225434-z1fw5e24joflaba1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: multi_walker
timestamp: Mon 2008-06-30 18:21:57 -0500
message:
  A mix-matched commit with things moving in each tree.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_tree.py'
--- a/bzrlib/tests/test_tree.py	2008-06-30 22:07:45 +0000
+++ b/bzrlib/tests/test_tree.py	2008-06-30 23:21:57 +0000
@@ -358,3 +358,31 @@
         self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
         self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
         self.assertRaises(StopIteration, iterator.next)
+
+    def test_different_file_id_in_others(self):
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/a', 'tree/b', 'tree/c/'])
+        tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
+        tree.commit('first', rev_id='first-rev-id')
+
+        tree.rename_one('b', 'c/d')
+        self.build_tree(['tree/b'])
+        tree.add(['b'], ['b2-id'])
+        tree.commit('second', rev_id='second-rev-id')
+
+        tree.rename_one('a', 'c/e')
+        self.build_tree(['tree/a'])
+        tree.add(['a'], ['a2-id'])
+
+        basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
+        first_tree = tree.branch.repository.revision_tree('first-rev-id')
+        walker = _mod_tree.MultiWalker(tree, [basis_tree, first_tree])
+
+        iterator = walker.iter_all()
+        self.assertWalkerNext(u'', root_id, True, [u'', u''], iterator)
+        self.assertWalkerNext(u'a', 'a2-id', True, [None, None], iterator)
+        self.assertWalkerNext(u'b', 'b2-id', True, [u'b', None], iterator)
+        self.assertWalkerNext(u'c', 'c-id', True, [u'c', u'c'], iterator)
+        self.assertWalkerNext(u'c/d', 'b-id', True, [u'c/d', u'b'], iterator)
+        self.assertWalkerNext(u'c/e', 'a-id', True, [u'a', u'a'], iterator)
+        self.assertRaises(StopIteration, iterator.next)