← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-26 23:17:08 UTC
  • mfrom: (3744.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080926231708-0eg771cwtjgjior1
(jam) Simple update for 'bzr branch' when going into a tree-less
        repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1157
1157
                basis = wt.basis_tree()
1158
1158
                basis.lock_read()
1159
1159
                subtrees = basis.iter_references()
 
1160
            elif result_branch is not None:
 
1161
                basis = result_branch.basis_tree()
 
1162
                basis.lock_read()
 
1163
                subtrees = basis.iter_references()
1160
1164
            elif source_branch is not None:
1161
1165
                basis = source_branch.basis_tree()
1162
1166
                basis.lock_read()