← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2007-02-09 15:05:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
Emit change listings before conflict warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1322
1322
        finally:
1323
1323
            child_pb.finished()
1324
1324
        conflicts = cook_conflicts(raw_conflicts, tt)
1325
 
        for conflict in conflicts:
1326
 
            warning(conflict)
1327
 
        pp.next_phase()
1328
1325
        if change_reporter:
1329
1326
            from bzrlib import delta
1330
1327
            change_reporter = delta.ChangeReporter(working_tree.inventory)
1331
1328
            delta.report_changes(tt._iter_changes(), change_reporter)
 
1329
        for conflict in conflicts:
 
1330
            warning(conflict)
 
1331
        pp.next_phase()
1332
1332
        tt.apply()
1333
1333
        working_tree.set_merge_modified({})
1334
1334
    finally: