In libsvn_client's merge: Pass the children_with_mergeinfo array as argument
instead of hidden in the baton. This allows using constness to describe
functions behavior on this array.

Keep a const pointer in the baton for notify processing.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Constify children_with_mergeinfo.
  (do_mergeinfo_unaware_dir_merge,
   flag_subtrees_needing_mergeinfo,
   record_mergeinfo_for_dir_merge,
   record_mergeinfo_for_added_subtrees,
   do_mergeinfo_aware_dir_merge): Add children_with_mergeinfo argument and
     use this array instead of the one in the baton.

  (do_directory_merge): Create array. Initialize and clear in baton.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1442556 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/merge.c
  (do_directory_merge): Following up on r1442556, fix compilation after
    last second before commit edit.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1442557 13f79535-47bb-0310-9956-ffa450edef68