← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

Merged bzr.dev and updated NEWS with a better description of changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
325
325
 
326
326
class MergeDirective2(_BaseMergeDirective):
327
327
 
328
 
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.19)'
 
328
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
329
329
 
330
330
    def __init__(self, revision_id, testament_sha1, time, timezone,
331
331
                 target_branch, patch=None, source_branch=None, message=None,
511
511
 
512
512
class MergeDirectiveFormatRegistry(registry.Registry):
513
513
 
514
 
    def register(self, directive):
515
 
        registry.Registry.register(self, directive._format_string, directive)
 
514
    def register(self, directive, format_string=None):
 
515
        if format_string is None:
 
516
            format_string = directive._format_string
 
517
        registry.Registry.register(self, format_string, directive)
516
518
 
517
519
 
518
520
_format_registry = MergeDirectiveFormatRegistry()
519
521
_format_registry.register(MergeDirective)
520
522
_format_registry.register(MergeDirective2)
 
523
_format_registry.register(MergeDirective2,
 
524
                          'Bazaar merge directive format 2 (Bazaar 0.19)')