← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Jelmer Vernooij
  • Date: 2010-08-20 19:07:17 UTC
  • mfrom: (5385 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100820190717-txm7aiyh6wtumgd3
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
46
46
from bzrlib.transport.memory import MemoryTransport
47
47
""")
48
48
from bzrlib.registry import Registry
 
49
from bzrlib.symbol_versioning import *
49
50
from bzrlib.textmerge import TextMerge
50
51
from bzrlib import bencode
51
52