~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Ian Clatworthy
  • Date: 2007-09-20 01:18:47 UTC
  • mfrom: (2825.4.1 knit-index-propogation)
  • mto: This revision was merged to the branch mainline in revision 2836.
  • Revision ID: ian.clatworthy@internode.on.net-20070920011847-mxya10w42px03fw2
No longer propagate index differences automatically (Robert Collins)

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
546
543
            start = outfile.tell()
547
544
            try:
548
545
                zipfile = GzipFile(None, mode='ab', fileobj=outfile)