← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 22:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912225953-6d8567932927b1e3
Change how 'revision' is imported to avoid problems later

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
34
34
    errors,
35
35
    lockable_files,
36
36
    lockdir,
 
37
    revision as _mod_revision,
37
38
    urlutils,
38
39
    xml4,
39
40
    xml5,
43
44
    sha_strings,
44
45
    sha_string,
45
46
    )
46
 
import bzrlib.revision
47
47
from bzrlib.store.revision.text import TextRevisionStore
48
48
from bzrlib.store.text import TextStore
49
49
from bzrlib.store.versioned import WeaveStore
691
691
        # done on this format anyway. So - acceptable wart.
692
692
        result = self.open_workingtree()
693
693
        if revision_id is not None:
694
 
            if revision_id == bzrlib.revision.NULL_REVISION:
 
694
            if revision_id == _mod_revision.NULL_REVISION:
695
695
                result.set_parent_ids([])
696
696
            else:
697
697
                result.set_parent_ids([revision_id])