← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-08 03:34:31 UTC
  • mfrom: (4266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4267.
  • Revision ID: tanner@real-time.com-20090408033431-draj0u7nd9bbby53
Merge 1.14rc1 back bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
316
316
        return version in self._parents
317
317
 
318
318
    def do_snapshot(self, version_id, parent_ids):
319
 
        """Determine whether to perform a a snapshot for this version"""
 
319
        """Determine whether to perform a snapshot for this version"""
320
320
        if self.snapshot_interval is None:
321
321
            return False
322
322
        if self.max_snapshots is not None and\