~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-27 19:41:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2660.
  • Revision ID: john@arbash-meinel.com-20070727194103-xj3g89nsqnxsiwpq
Add some more hpss logging.
Also, remove a spurious call to 'get_master_branch()' as part of 'bzr update'

Show diffs side-by-side

added added

removed removed

Lines of Context:
1029
1029
            if last_rev == _mod_revision.ensure_null(
1030
1030
                tree.branch.last_revision()):
1031
1031
                # may be up to date, check master too.
1032
 
                master = tree.branch.get_master_branch()
1033
1032
                if master is None or last_rev == _mod_revision.ensure_null(
1034
1033
                    master.last_revision()):
1035
1034
                    revno = tree.branch.revision_id_to_revno(last_rev)