← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/serializer.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/serializer.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
93
93
 
94
94
 
95
95
format_registry = SerializerRegistry()
 
96
format_registry.register_lazy('4', 'bzrlib.xml4', 'serializer_v4')
96
97
format_registry.register_lazy('5', 'bzrlib.xml5', 'serializer_v5')
97
98
format_registry.register_lazy('6', 'bzrlib.xml6', 'serializer_v6')
98
99
format_registry.register_lazy('7', 'bzrlib.xml7', 'serializer_v7')