← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-03-07 23:15:10 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2325.
  • Revision ID: abentley@panoramicfeedback.com-20070307231510-jae63zsli83db3eb
Make ChangeReporter private

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
610
610
        old_rh = branch_to.revision_history()
611
611
        if tree_to is not None:
612
612
            result = tree_to.pull(branch_from, overwrite, rev_id,
613
 
                delta.ChangeReporter(unversioned_filter=tree_to.is_ignored))
 
613
                delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
614
614
        else:
615
615
            result = branch_to.pull(branch_from, overwrite, rev_id)
616
616
 
2498
2498
        #      Either the merge helper code should be updated to take a tree,
2499
2499
        #      (What about tree.merge_from_branch?)
2500
2500
        tree = WorkingTree.open_containing(directory)[0]
2501
 
        change_reporter = delta.ChangeReporter(
 
2501
        change_reporter = delta._ChangeReporter(
2502
2502
            unversioned_filter=tree.is_ignored)
2503
2503
 
2504
2504
        if branch is not None: