~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Robert Collins
  • Date: 2008-04-09 00:34:54 UTC
  • mto: This revision was merged to the branch mainline in revision 3350.
  • Revision ID: robertc@robertcollins.net-20080409003454-x19fm1n0o2govzh6
 * ``VersionedFile.annotate_iter`` is deprecated. While in principal this
   allows lower memory use, all users of annotations wanted full file 
   annotations, and there is no storage format suitable for incremental
   line-by-line annotation. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
382
382
                    if [p for p in parents if p not in self._parents] != []:
383
383
                        continue
384
384
                    lines = [a + ' ' + l for a, l in
385
 
                             vf.annotate_iter(revision)]
 
385
                             vf.annotate(revision)]
386
386
                    if snapshots is None:
387
387
                        force_snapshot = None
388
388
                    else: