← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: Parth Malwankar
  • Date: 2010-05-03 08:13:32 UTC
  • mfrom: (5199 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5210.
  • Revision ID: parth.malwankar@gmail.com-20100503081332-sccscii0dqslaqu3
merged in changes from trunk and resolved conflict in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
16
16
 
17
17
from bzrlib.xml_serializer import (
18
18
    Element,
19
 
    ElementTree,
20
19
    SubElement,
21
20
    XMLSerializer,
22
21
    escape_invalid_chars,
23
22
    )
24
 
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
 
23
from bzrlib.inventory import ROOT_ID, Inventory
25
24
import bzrlib.inventory as inventory
26
25
from bzrlib.revision import Revision
27
26
from bzrlib.errors import BzrError