/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Kent Gibson
  • Date: 2007-03-11 13:44:18 UTC
  • mfrom: (2334 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2350.
  • Revision ID: warthog618@gmail.com-20070311134418-nu57arul94zawbj4
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1419
1419
            child_pb.finished()
1420
1420
        conflicts = cook_conflicts(raw_conflicts, tt)
1421
1421
        if change_reporter:
1422
 
            change_reporter = delta.ChangeReporter(
 
1422
            change_reporter = delta._ChangeReporter(
1423
1423
                unversioned_filter=working_tree.is_ignored)
1424
1424
            delta.report_changes(tt._iter_changes(), change_reporter)
1425
1425
        for conflict in conflicts: