/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: Robert Collins
  • Date: 2007-03-05 03:43:56 UTC
  • mfrom: (2312 +trunk)
  • mto: (2255.11.6 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070305034356-og43j35eg62m952f
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1387
1387
            child_pb.finished()
1388
1388
        conflicts = cook_conflicts(raw_conflicts, tt)
1389
1389
        if change_reporter:
1390
 
            change_reporter = delta.ChangeReporter()
 
1390
            change_reporter = delta.ChangeReporter(
 
1391
                unversioned_filter=working_tree.is_ignored)
1391
1392
            delta.report_changes(tt._iter_changes(), change_reporter)
1392
1393
        for conflict in conflicts:
1393
1394
            warning(conflict)