← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: jelmer at samba
  • Date: 2011-10-11 12:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111011120151-l1aa35zasaocrev3
Fix tests and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
30
30
from bzrlib import (
31
31
    annotate,
32
32
    bencode,
33
 
    bzrdir,
 
33
    controldir,
34
34
    commit,
35
35
    conflicts,
36
36
    delta,
2596
2596
                    kind = file_kind(target_path)
2597
2597
                    if kind == "directory":
2598
2598
                        try:
2599
 
                            bzrdir.BzrDir.open(target_path)
 
2599
                            controldir.ControlDir.open(target_path)
2600
2600
                        except errors.NotBranchError:
2601
2601
                            pass
2602
2602
                        else: