← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Robert Collins
  • Date: 2007-07-25 00:52:21 UTC
  • mfrom: (2650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070725005221-0ysm6il5mqnme3wz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
233
233
                    if e.errno != errno.ENOENT:
234
234
                        raise
235
235
 
236
 
    def select_conflicts(self, tree, paths, ignore_misses=False):
 
236
    def select_conflicts(self, tree, paths, ignore_misses=False,
 
237
                         recurse=False):
237
238
        """Select the conflicts associated with paths in a tree.
238
239
        
239
240
        File-ids are also used for this.
258
259
                if cpath in path_set:
259
260
                    selected = True
260
261
                    selected_paths.add(cpath)
 
262
                if recurse:
 
263
                    if osutils.is_inside_any(path_set, cpath):
 
264
                        selected = True
 
265
                        selected_paths.add(cpath)
 
266
 
261
267
            for key in ('file_id', 'conflict_file_id'):
262
268
                cfile_id = getattr(conflict, key, None)
263
269
                if cfile_id is None: