/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: Daniel Watkins
  • Date: 2007-11-06 09:33:05 UTC
  • mfrom: (2967 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2993.
  • Revision ID: d.m.watkins@warwick.ac.uk-20071106093305-zfef3c0jbcvunnuz
Merged bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
540
540
    def add_diff(self, diff, version_id, parent_ids):
541
541
        outfile = open(self._filename + '.mpknit', 'ab')
542
542
        try:
 
543
            outfile.seek(0, 2)      # workaround for windows bug:
 
544
                                    # .tell() for files opened in 'ab' mode
 
545
                                    # before any write returns 0
543
546
            start = outfile.tell()
544
547
            try:
545
548
                zipfile = GzipFile(None, mode='ab', fileobj=outfile)