/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/xml6.py

Merge from bzr.dev.  Breaks a few tests because there are new methods not yet implemented.

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
                                                   % format)
43
43
        revision_id = elt.get('revision_id')
44
44
        if revision_id is not None:
45
 
            revision_id = cache_utf8.get_cached_unicode(revision_id)
 
45
            revision_id = cache_utf8.encode(revision_id)
46
46
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
47
47
        for e in elt:
48
 
            ie = self._unpack_entry(e, none_parents=True)
 
48
            ie = self._unpack_entry(e)
49
49
            inv.add(ie)
50
50
        return inv
51
51