← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

Committer: Aaron Bentley
Date: 2006-01-23 14:49:49 UTC
mfrom: (1549 bzr.dev (Main development branch))
mto: (1185.50.54 bzr-jam-integration)
mto: This revision was merged to the branch mainline in revision 1550.
Revision ID: abentley@panoramicfeedback.com-20060123144949-0ec7474cc54bd4d2

Dirty merge from mainline

files added:
bzrlib/tests/blackbox/test_added.py

bzrlib/tests/blackbox/test_diff.py

bzrlib/tests/blackbox/test_outside_wt.py

files renamed:
bzrlib/xml.py => bzrlib/xml_serializer.py

files modified:
NEWS

TODO

bzrlib/_changeset.py

bzrlib/_merge_core.py

bzrlib/branch.py

bzrlib/builtins.py

bzrlib/fetch.py

bzrlib/option.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_too_much.py

bzrlib/tests/stub_sftp.py

bzrlib/tests/test_branch.py

bzrlib/tests/test_fileid_involved.py

bzrlib/tests/test_merge_core.py

bzrlib/tests/test_sftp_transport.py

bzrlib/transport/ftp.py

bzrlib/transport/sftp.py

bzrlib/uncommit.py

bzrlib/upgrade.py

bzrlib/workingtree.py

bzrlib/xml4.py

bzrlib/xml5.py

Show diffs side-by-side

added added

removed removed

13

13

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

14

14

15

15

16

from bzrlib.xml import ElementTree, SubElement, Element, Serializer

16

from bzrlib.xml_serializer import ElementTree, SubElement, Element, Serializer

17

17

from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry

18

18

import bzrlib.inventory as inventory

19

19

from bzrlib.revision import Revision

Older »