plundblad


Found Review
r23397 r23397

r23397 | kameshj | 2007-02-15 00:31:46 -0600 (Thu, 15 Feb 2007)

Reporter api calls should be made in a depth first order.

* subversion/libsvn_client/diff.c
  Include "svn_sorts.h".
  (discover_and_merge_children): Change the signature to accept 
   'children_with_mergeinfo' of type 'apr_array_header_t **' 
   as an out param instead of 'apr_hash_t *'.
   Sort 'children_with_mergeinfo_hash' a local hash by path and pass the 
   sorted list to subsequent calls to do_merge.
  (do_merge): Change the signature to accept the 
   '*depth first ordered list* of children with mergeinfo' instead of *hash*.
  (svn_client_merge3, svn_client_merge_peg3): Adjust for the above 2 API 
   changes.
  
* subversion/tests/cmdline/merge_tests.py
  (tweak_src_then_merge_to_dest, 
   obey_reporter_api_semantics_while_doing_subtree_merges): 
    New functions.
  (test_list): Include the new testcase.

Found by: plundblad
Reviewed by: plundblad
             dlr
Approved by: dlr
             plundblad