Rev 3746: (jam) Simple update for 'bzr branch' when going into a tree-less in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3746
revision-id: pqm at pqm.ubuntu.com-20080926231708-0eg771cwtjgjior1
parent: pqm at pqm.ubuntu.com-20080926224240-12brpogngz8mmlrz
parent: john at arbash-meinel.com-20080926222121-xmk5z6us1ks0ctn5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-09-27 00:17:08 +0100
message:
  (jam) Simple update for 'bzr branch' when going into a tree-less
  	repository.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3744.1.1
    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.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== 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()