← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-15 15:03:15 UTC
  • mfrom: (4797.42.3 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: v.ladeuil+lp@free.fr-20100415150315-y2bbh2tzvshyzet0
Merge 2.1 into bzr.dev including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
607
607
            # which is newer than a previously supplied older-than version.
608
608
            # This indicates that some smart verb call is not guarded
609
609
            # appropriately (it should simply not have been tried).
610
 
            trace.mutter(
 
610
            raise AssertionError(
611
611
                "_remember_remote_is_before(%r) called, but "
612
612
                "_remember_remote_is_before(%r) was called previously."
613
 
                , version_tuple, self._remote_version_is_before)
614
 
            if 'hpss' in debug.debug_flags:
615
 
                ui.ui_factory.show_warning(
616
 
                    "_remember_remote_is_before(%r) called, but "
617
 
                    "_remember_remote_is_before(%r) was called previously."
618
 
                    % (version_tuple, self._remote_version_is_before))
619
 
            return
 
613
                % (version_tuple, self._remote_version_is_before))
620
614
        self._remote_version_is_before = version_tuple
621
615
 
622
616
    def protocol_version(self):