/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/xml8.py

  • Committer: Andrew Bennetts
  • Date: 2010-04-22 07:35:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5193.
  • Revision ID: andrew.bennetts@canonical.com-20100422073506-7i5pqyhzdj5pcelx
Create a PerFileMerger helper class that is midway between AbstractPerFileMerger and ConfigurableFileMerger.  It allows the example merge plugin in the docs (the always conflict *.xml files) to be much, much simpler.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml8.py
30
30
    XMLSerializer,
31
31
    escape_invalid_chars,
32
32
    )
33
 
from bzrlib.inventory import InventoryEntry
 
33
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
34
34
from bzrlib.revision import Revision
35
35
from bzrlib.errors import BzrError
36
36