← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-01-24 15:33:55 UTC
  • mto: (1185.50.54 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: abentley@panoramicfeedback.com-20060124153355-8d91160257425086
Fixed up non-absolute imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
196
196
 
197
197
    def create(self, file_id, path, tree):
198
198
        """Uses tree data to create a filesystem object for the file_id"""
199
 
        from _changeset import get_contents
 
199
        from bzrlib._changeset import get_contents
200
200
        get_contents(tree, file_id)(path, self)
201
201
 
202
202
    def missing_for_merge(self, file_id, other_path):