← 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: 2009-06-03 01:37:27 UTC
  • mfrom: (2694.5.22 bencode-pyrex)
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090603013727-wtxochxrd0zqf1vg
Merge the bencode implementation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
47
47
from bzrlib.registry import Registry
48
48
from bzrlib.symbol_versioning import *
49
49
from bzrlib.textmerge import TextMerge
50
 
from bzrlib.util import bencode
 
50
from bzrlib import bencode
51
51
 
52
52
 
53
53
adapter_registry = Registry()