← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
510
510
    'bzrlib.smart.branch', 'SmartServerRequestRevisionHistory')
511
511
request_handlers.register_lazy( 'Branch.set_config_option',
512
512
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetConfigOption')
 
513
request_handlers.register_lazy( 'Branch.set_config_option_dict',
 
514
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetConfigOptionDict')
513
515
request_handlers.register_lazy( 'Branch.set_last_revision',
514
516
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetLastRevision')
515
517
request_handlers.register_lazy(