← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
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: