Re: svn commit: r1442556 - /subversion/trunk/subversion/libsvn_client/merge.c

Hi Bert.  Another nice change in your series!

You missed updating references to CHILDREN_WITH_MERGEINFO in the doc string and/or in-line comments of:

  do_mergeinfo_unaware_dir_merge()
  flag_subtrees_needing_mergeinfo()
  record_mergeinfo_for_dir_merge()
  do_mergeinfo_aware_dir_merge()

(Also some wrong references to it remain elsewhere, perhaps unrelated to your changes.)

- Julian

> URL: http://svn.apache.org/viewvc?rev=1442556&view=rev
> Log:
> 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.
Received on 2013-02-05 17:14:58 CET