/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/smart/request.py

  • Committer: Vincent Ladeuil
  • Date: 2010-11-05 14:07:45 UTC
  • mfrom: (5050.45.7 2.2)
  • mto: This revision was merged to the branch mainline in revision 5524.
  • Revision ID: v.ladeuil+lp@free.fr-20101105140745-e5xwb9b75a4i7ef1
Merge 2.2 into trunk resolving conflicts and including fix for bug #632465

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(