← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-15 14:07:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3315.
  • Revision ID: john@arbash-meinel.com-20080315140755-5d1bxutgwx4bnnt8
Avoid opening the master branch when we won't use it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2161
2161
          basis.
2162
2162
        - Do a 'normal' merge of the old branch basis if it is relevant.
2163
2163
        """
2164
 
        if self.branch.get_master_branch(possible_transports) is not None:
 
2164
        if self.branch.get_bound_location() is not None:
2165
2165
            self.lock_write()
2166
2166
            update_branch = True
2167
2167
        else: