Rev 3469: fix a test that assumed WT4.set_parent_trees() wouldn't filter the list. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/status_double_pending_235407

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3469
revision-id: john at arbash-meinel.com-20080604215505-ko3ifumiiyn2vi6k
parent: john at arbash-meinel.com-20080604175630-tngg9jlwn6jzebgv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_double_pending_235407
timestamp: Wed 2008-06-04 16:55:05 -0500
message:
  fix a test that assumed WT4.set_parent_trees() wouldn't filter the list.
modified:
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py	2008-03-07 14:15:10 +0000
+++ b/bzrlib/tests/test_workingtree_4.py	2008-06-04 21:55:05 +0000
@@ -115,17 +115,19 @@
         rev2 = subtree2.commit('commit in subdir2')
 
         subtree.flush()
-        subtree.merge_from_branch(subtree2.branch)
-        rev3 = subtree.commit('merge from subdir2')
+        subtree3 = subtree.bzrdir.sprout('subdir3').open_workingtree()
+        rev3 = subtree3.commit('merge from subdir2')
 
         repo = tree.branch.repository
-        repo.fetch(subtree.branch.repository, rev3)
+        repo.fetch(subtree.branch.repository, rev1)
+        repo.fetch(subtree2.branch.repository, rev2)
+        repo.fetch(subtree3.branch.repository, rev3)
         # will also pull the others...
 
         # create repository based revision trees
-        rev1_revtree = subtree.branch.repository.revision_tree(rev1)
-        rev2_revtree = subtree2.branch.repository.revision_tree(rev2)
-        rev3_revtree = subtree.branch.repository.revision_tree(rev3)
+        rev1_revtree = repo.revision_tree(rev1)
+        rev2_revtree = repo.revision_tree(rev2)
+        rev3_revtree = repo.revision_tree(rev3)
         # tree doesn't contain a text merge yet but we'll just
         # set the parents as if a merge had taken place. 
         # this should cause the tree data to be folded into the