/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: Alexander Belchenko
  • Date: 2007-03-13 02:16:17 UTC
  • mfrom: (2346 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2356.
  • Revision ID: bialix@ukr.net-20070313021617-azd5lv30b23gyu48
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1047
1047
                to_path = final_paths.get_path(to_trans_id)
1048
1048
            if from_kind != to_kind:
1049
1049
                modified = True
1050
 
            elif to_kind in ('file' or 'symlink') and (
 
1050
            elif to_kind in ('file', 'symlink') and (
1051
1051
                to_trans_id != from_trans_id or
1052
1052
                to_trans_id in self._new_contents):
1053
1053
                modified = True
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: