← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Andrew Bennetts
  • Date: 2010-05-03 04:08:50 UTC
  • mfrom: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100503040850-wm4v7qx6wx3u7ns1
Merge lp:bzr/2.1 into lp:bzr, including fix for #528041.

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
 
            raise AssertionError(
 
610
            trace.mutter(
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))
 
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
614
620
        self._remote_version_is_before = version_tuple
615
621
 
616
622
    def protocol_version(self):