Fix remaining bug from issue #2825 'Handle --depth option for 'merge' operations in terms of both content and merge info'.
Fix remaining bug from issue #2825 'Handle --depth option for 'merge'
operations in terms of both content and merge info'.

An inoperative merge to a directory at --depth files should set
non-inheritable mergeinfo on the merge target *and* normal mergeinfo on
any of the target's file children.  This fits with the current disposition
of issue #2883.  See item D) in 
http://subversion.tigris.org/issues/show_bug.cgi?id=2825#desc5.

* subversion/libsvn_client/merge.c
  (THE CHILDREN_WITH_MERGEINFO ARRAY): Minor tweak to this global comment.
  (get_mergeinfo_walk_cb): Simplify check for paths which are immediate
  children of the merge target when depth is 'immediates'.  Also check for
  file paths which are immediate children of the merge target when depth is
  'files'.
  (get_mergeinfo_paths): Update doc string noting one case we've handled
  for a long time and one new case.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion