← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-17 15:33:07 UTC
  • mfrom: (4297.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090417153307-fmbzf4klhhqbawrh
(vila) (trivial) More cleanup test imports and use features to better
        track skipped tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
566
566
_format_registry = MergeDirectiveFormatRegistry()
567
567
_format_registry.register(MergeDirective)
568
568
_format_registry.register(MergeDirective2)
 
569
# 0.19 never existed.  It got renamed to 0.90.  But by that point, there were
 
570
# already merge directives in the wild that used 0.19. Registering with the old
 
571
# format string to retain compatibility with those merge directives.
569
572
_format_registry.register(MergeDirective2,
570
573
                          'Bazaar merge directive format 2 (Bazaar 0.19)')