~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2009-06-29 14:51:13 UTC
  • mfrom: (4489 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4490.
  • Revision ID: aaron@aaronbentley.com-20090629145113-3w350dxgqppnzo4g
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
1970
1970
        if not CompiledDirstateHelpersFeature.available():
1971
1971
            from bzrlib.tests import UnavailableFeature
1972
1972
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
1973
 
        from bzrlib._dirstate_helpers_c import ProcessEntryC
 
1973
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1974
1974
        result = klass.make_source_parent_tree(source, target)
1975
1975
        result[1]._iter_changes = ProcessEntryC
1976
1976
        return result