← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
31
31
    revision as _mod_revision,
32
32
    transport as _mod_transport,
33
33
    ui,
34
 
    urlutils,
35
34
    )
36
35
from bzrlib.push import (
37
36
    PushResult,
38
37
    )
39
 
from bzrlib.transport import (
40
 
    local,
41
 
    )
42
38
 
43
39
""")
44
40