At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 3745
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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.
=== 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()
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
