← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/index.py

  • Committer: Rory Yorke
  • Date: 2010-09-24 16:16:13 UTC
  • mto: This revision was merged to the branch mainline in revision 5455.
  • Revision ID: rory.yorke@gmail.com-20100924161613-269xiflsrhqrhydh
Added --show-base to pull and update (bug 202374).

Behaviour copied from merge.  Tests in
tests/blackbox/test_{pull,update}.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/index.py
462
462
        trailers = 0
463
463
        pos = stream.tell()
464
464
        lines = stream.read().split('\n')
 
465
        # GZ 2009-09-20: Should really use a try/finally block to ensure close
465
466
        stream.close()
466
467
        del lines[-1]
467
468
        _, _, _, trailers = self._parse_lines(lines, pos)