Rev 3315: (jam) avoid opening the master branch during update when it isn't in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3315
revision-id:pqm at pqm.ubuntu.com-20080329121122-edbj8ht3fbr35nfs
parent: pqm at pqm.ubuntu.com-20080328090406-vc3xtc517r5z96bp
parent: john at arbash-meinel.com-20080315140755-5d1bxutgwx4bnnt8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-03-29 12:11:22 +0000
message:
  (jam) avoid opening the master branch during update when it isn't
  	used.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3280.4.1
    revision-id:john at arbash-meinel.com-20080315140755-5d1bxutgwx4bnnt8
    parent: pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: remove_master_open
    timestamp: Sat 2008-03-15 14:07:55 +0000
    message:
      Avoid opening the master branch when we won't use it.
    modified:
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2008-03-12 01:06:03 +0000
+++ b/bzrlib/workingtree.py	2008-03-15 14:07:55 +0000
@@ -2161,7 +2161,7 @@
           basis.
         - Do a 'normal' merge of the old branch basis if it is relevant.
         """
-        if self.branch.get_master_branch(possible_transports) is not None:
+        if self.branch.get_bound_location() is not None:
             self.lock_write()
             update_branch = True
         else: