~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-11 01:31:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5376.
  • Revision ID: john@arbash-meinel.com-20100811013111-wdrv1hp03kir7gf2
change slots back to a list.

It actually works the way it was written, but I assume it is some
sort of DWIM in the python code, so we'll try to be more standard
about it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
class MultiParent(object):
77
77
    """A multi-parent diff"""
78
78
 
79
 
    __slots__ = ('hunks')
 
79
    __slots__ = ['hunks']
80
80
 
81
81
    def __init__(self, hunks=None):
82
82
        if hunks is not None: