← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-10-16 07:18:10 UTC
  • mfrom: (2080.2.2 no-warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20061016071810-36dcc90223d479b4
(John Arbash Meinel) teach the pqm to require no warnings, and update remerge to not use iter_conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2328
2328
                    for name, ie in tree.inventory.iter_entries(file_id):
2329
2329
                        interesting_ids.add(ie.file_id)
2330
2330
                new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
 
2331
            else:
 
2332
                restore_files = [c.path for c in conflicts]
2331
2333
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2332
2334
            tree.set_conflicts(ConflictList(new_conflicts))
2333
 
            if file_list is None:
2334
 
                restore_files = list(tree.iter_conflicts())
2335
 
            else:
 
2335
            if file_list is not None:
2336
2336
                restore_files = file_list
2337
2337
            for filename in restore_files:
2338
2338
                try: