~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

merge dirstate (and trunk)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)