← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2006-10-18 02:26:35 UTC
  • mto: This revision was merged to the branch mainline in revision 2088.
  • Revision ID: aaron.bentley@utoronto.ca-20061018022635-3fd648bf19f8e56f
Support updating lightweight checkouts of readonly branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
849
849
 
850
850
    def run(self, dir='.'):
851
851
        tree = WorkingTree.open_containing(dir)[0]
852
 
        tree.lock_write()
 
852
        master = tree.branch.get_master_branch()
 
853
        if master is not None:
 
854
            tree.lock_write()
 
855
        else:
 
856
            tree.lock_tree_write()
853
857
        try:
854
858
            existing_pending_merges = tree.get_parent_ids()[1:]
855
859
            last_rev = tree.last_revision()