← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-07 23:06:59 UTC
  • mfrom: (2221.4.17 registryoption)
  • Revision ID: pqm@pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
Use a Registry for merge-type options

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2363
2363
                             ' you do not need to commit the result.'),
2364
2364
                     ]
2365
2365
 
2366
 
    def help(self):
2367
 
        from inspect import getdoc
2368
 
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2369
 
 
2370
2366
    def run(self, branch=None, revision=None, force=False, merge_type=None,
2371
2367
            show_base=False, reprocess=False, remember=False, 
2372
2368
            uncommitted=False, pull=False):
2500
2496
                     Option('show-base', help="Show base revision text in "
2501
2497
                            "conflicts")]
2502
2498
 
2503
 
    def help(self):
2504
 
        from inspect import getdoc
2505
 
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2506
 
 
2507
2499
    def run(self, file_list=None, merge_type=None, show_base=False,
2508
2500
            reprocess=False):
2509
2501
        if merge_type is None: