← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.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/smart/protocol.py
1231
1231
                    if first_chunk is None:
1232
1232
                        first_chunk = chunk
1233
1233
                    self._write_prefixed_body(chunk)
 
1234
                    self.flush()
1234
1235
                    if 'hpssdetail' in debug.debug_flags:
1235
1236
                        # Not worth timing separately, as _write_func is
1236
1237
                        # actually buffered