← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-25 08:03:25 UTC
  • mfrom: (1948.2.2 misc fixen)
  • Revision ID: pqm@pqm.ubuntu.com-20060825080325-00501d7303f03e89
(robertc) Fix cmd_update can throw failure-to-unlock warnings if pending_merges fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
822
822
    def run(self, dir='.'):
823
823
        tree = WorkingTree.open_containing(dir)[0]
824
824
        tree.lock_write()
825
 
        existing_pending_merges = tree.pending_merges()
826
825
        try:
827
 
            last_rev = tree.last_revision() 
 
826
            existing_pending_merges = tree.pending_merges()
 
827
            last_rev = tree.last_revision()
828
828
            if last_rev == tree.branch.last_revision():
829
829
                # may be up to date, check master too.
830
830
                master = tree.branch.get_master_branch()