Rev 3745: When branching into a tree-less repository, use the target branch in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3745
revision-id: john at arbash-meinel.com-20080926222121-xmk5z6us1ks0ctn5
parent: pqm at pqm.ubuntu.com-20080926211130-ojyixbni0jpqoify
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-09-26 17:21:21 -0500
message:
  When branching into a tree-less repository, use the target branch
  rather than the source branch, to check for reference trees that also need
  to be fetched.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2008-09-17 07:18:20 +0000
+++ b/bzrlib/bzrdir.py	2008-09-26 22:21:21 +0000
@@ -1157,6 +1157,10 @@
                 basis = wt.basis_tree()
                 basis.lock_read()
                 subtrees = basis.iter_references()
+            elif result_branch is not None:
+                basis = result_branch.basis_tree()
+                basis.lock_read()
+                subtrees = basis.iter_references()
             elif source_branch is not None:
                 basis = source_branch.basis_tree()
                 basis.lock_read()