/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-29 00:22:51 UTC
  • mfrom: (3040.2.3 164443-hpss-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20071129002251-zx5sh1lk79tfebhf
Give a better message when failing to pull because the source needs to be reconciled (#164443)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
770
770
                    # line-delta is no use unless we have its parent.
771
771
                    # Fetching from a broken repository with this problem
772
772
                    # shouldn't break the target repository.
 
773
                    #
 
774
                    # See https://bugs.launchpad.net/bzr/+bug/164443
773
775
                    if not self._index.has_version(parents[0]):
774
776
                        raise KnitCorrupt(
775
777
                            self.filename,
776
 
                            'line-delta from stream references '
777
 
                            'missing parent %s' % parents[0])
 
778
                            'line-delta from stream '
 
779
                            'for version %s '
 
780
                            'references '
 
781
                            'missing parent %s\n'
 
782
                            'Try running "bzr check" '
 
783
                            'on the source repository, and "bzr reconcile" '
 
784
                            'if necessary.' %
 
785
                            (version_id, parents[0]))
778
786
                self._add_raw_records(
779
787
                    [(version_id, options, parents, length)],
780
788
                    reader_callable(length))