/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: 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:
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(