~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

• browse files at revision 2255.2.182
• compare with another revision
• compare with revision 3224.1.1
• download diff
• download tarball
• view history from revision 2255.2.182

Show diffs side-by-side

added

removed

bzrlib/transform.py

1408

1408

            child_pb.finished()

1409

1409

        conflicts = cook_conflicts(raw_conflicts, tt)

1410

1410

        if change_reporter:

1411

 

            change_reporter = delta.ChangeReporter()

 

1411

            change_reporter = delta.ChangeReporter(

 

1412

                unversioned_filter=working_tree.is_ignored)

1412

1413

            delta.report_changes(tt._iter_changes(), change_reporter)

1413

1414

        for conflict in conflicts:

1414

1415

            warning(conflict)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1