/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: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5153.
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)

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