/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/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-08 23:15:38 UTC
  • mfrom: (4265 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4281.
  • Revision ID: jelmer@samba.org-20090408231538-8eg51q2cqtl2hkx3
Merge 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\