← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-03 21:50:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4253.
  • Revision ID: jelmer@samba.org-20090403215040-lz70cjc4i8bfg9xd
Review from Aaron: 
- move generic serializer tests to bzrlib.tests.test_serializer.
- fix some formatting
- add NEWS item

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib import bencode
 
31
from bzrlib.util import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34
 
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 snapshot for this version"""
 
319
        """Determine whether to perform a 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\