Adjust the issue #4057 fix made in r1211620 to account for svn_ra_get_log2's limitations when using a BDB backend.
Adjust the issue #4057 fix made in r1211620 to account for svn_ra_get_log2's
limitations when using a BDB backend.

This fixes the currently failing tests with --fs-type=bdb:

  FAIL:  merge_tests.py 120: reverse merge adds subtree
  FAIL:  merge_tests.py 124: shallow merge reaches all necessary subtrees

* subversion/libsvn_client/merge.c

  (log_find_operative_subtree_baton_t): Add a svn_wc_context_t * member.

  (log_find_operative_subtree_revs): Account for the fact 
   that the svn_log_changed_path2_t.node_kind members in in 
   log_entry->changed_paths2 may be set to svn_node_unknown (e.g. with a BDB
   backend).

  (get_operative_immediate_children): Initialize new
   log_find_operative_subtree_baton_t member.



git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1212015 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion