← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 11:49:56 UTC
  • mfrom: (6384 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219114956-wb5i1g0ku1t49vk6
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
22
22
import time
23
23
 
24
24
from bzrlib import (
25
 
    bzrdir,
26
25
    config,
27
26
    controldir,
28
27
    debug,
41
40
""")
42
41
 
43
42
from bzrlib import (
 
43
    bzrdir,
44
44
    errors,
45
45
    registry,
46
46
    symbol_versioning,