← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-23 23:21:12 UTC
  • mfrom: (1953 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: john@arbash-meinel.com-20060823232112-f755378d583374a8
[merge] bzr.dev 1953

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()
825
826
        try:
826
 
            existing_pending_merges = tree.pending_merges()
827
 
            last_rev = tree.last_revision()
 
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()