~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
    cache_utf8,
22
22
    errors,
23
23
    inventory,
 
24
    revision as _mod_revision,
24
25
    )
25
26
from bzrlib.xml_serializer import SubElement, Element, Serializer
26
27
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
256
257
            pelts.tail = pelts.text = '\n'
257
258
            for parent_id in rev.parent_ids:
258
259
                assert isinstance(parent_id, basestring)
 
260
                _mod_revision.check_not_reserved_id(parent_id)
259
261
                p = SubElement(pelts, 'revision_ref')
260
262
                p.tail = '\n'
261
263
                if isinstance(parent_id, str):