~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2005-10-11 03:19:29 UTC
  • Revision ID: robertc@robertcollins.net-20051011031929-2d523107133c43be
further tuning of pull, do not do a local merge or fetch at all, if the remote branch is no newer than we are

Show diffs side-by-side

added added

removed removed

Lines of Context:
1010
1010
        from bzrlib.revision import get_intervening_revisions
1011
1011
        if stop_revision is None:
1012
1012
            stop_revision = other.last_revision()
 
1013
        if stop_revision is not None and self.has_revision(stop_revision):
 
1014
            return
1013
1015
        greedy_fetch(to_branch=self, from_branch=other,
1014
1016
                     revision=stop_revision)
1015
1017
        pullable_revs = self.missing_revisions(