~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-26 08:56:09 UTC
  • mfrom: (2592.3.247 mbp-writegroups)
  • Revision ID: pqm@pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
Unlock while in a write group now aborts the write group, unlocks, and errors.  Also includes the knit extraction one-liner tweak.

Show diffs side-by-side

added added

removed removed

Lines of Context:
836
836
                if method == 'fulltext':
837
837
                    next = None
838
838
                else:
839
 
                    next = self.get_parents(cursor)[0]
 
839
                    next = self.get_parents_with_ghosts(cursor)[0]
840
840
                index_memo = self._index.get_position(cursor)
841
841
                component_data[cursor] = (method, index_memo, next)
842
842
                cursor = next