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

  • Committer: Arnaud Jeansen
  • Date: 2010-04-15 20:22:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5161.
  • Revision ID: arnaud.jeansen@gmail.com-20100415202204-862f6y0nh76dhpjp
Remove XXX as per Robert's comment in the merge proposal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
45
45
from bzrlib.graph import DictParentsProvider, Graph, StackedParentsProvider
46
46
from bzrlib.transport.memory import MemoryTransport
47
47
""")
 
48
from bzrlib.inter import InterObject
48
49
from bzrlib.registry import Registry
49
50
from bzrlib.symbol_versioning import *
50
51
from bzrlib.textmerge import TextMerge