← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2008-06-18 07:46:41 UTC
  • mto: (3452.2.9 inter-remote-pack)
  • mto: This revision was merged to the branch mainline in revision 3511.
  • Revision ID: andrew.bennetts@canonical.com-20080618074641-gletfspa4l47yq6q
Fix test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1641
1641
    def generate_revision_history(self, revision_id, last_rev=None,
1642
1642
                                  other_branch=None):
1643
1643
        medium = self._client._medium
1644
 
        if medium._is_remote_at_least((1, 6)):
 
1644
        if not medium._is_remote_before((1, 6)):
1645
1645
            try:
1646
1646
                self._set_last_revision_descendant(revision_id, other_branch,
1647
1647
                    allow_diverged=True, do_not_overwrite_descendant=False)
1648
1648
                return
1649
1649
            except errors.UnknownSmartMethod:
1650
 
                medium._remote_is_not((1, 6))
 
1650
                medium._remember_remote_is_before((1, 6))
1651
1651
        self._clear_cached_state()
1652
1652
        self._ensure_real()
1653
1653
        self._real_branch.generate_revision_history(
1681
1681
                self._set_last_revision(stop_revision)
1682
1682
            else:
1683
1683
                medium = self._client._medium
1684
 
                if medium._is_remote_at_least((1, 6)):
 
1684
                if not medium._is_remote_before((1, 6)):
1685
1685
                    try:
1686
1686
                        self._set_last_revision_descendant(stop_revision, other)
1687
1687
                        return
1688
1688
                    except errors.UnknownSmartMethod:
1689
 
                        medium._remote_is_not((1, 6))
 
1689
                        medium._remember_remote_is_before((1, 6))
1690
1690
                # Fallback for pre-1.6 servers: check for divergence
1691
1691
                # client-side, then do _set_last_revision.
1692
1692
                last_rev = revision.ensure_null(self.last_revision())