/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/_knit_load_data_c.pyx

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_knit_load_data_c.pyx
171
171
                Py_INCREF(parent)
172
172
            PyList_Append(parents, parent)
173
173
            parent_str = next + 1
174
 
        return parents
 
174
        return tuple(parents)
175
175
 
176
176
    cdef int process_one_record(self, char *start, char *end) except -1:
177
177
        """Take a simple string and split it into an index record."""