← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

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 *
50
49
from bzrlib.textmerge import TextMerge
51
50
from bzrlib import bencode
52
51