Optimize the conflict resolver code a bit by reducing the number of database queries used while walking the tree for conflicts.
Optimize the conflict resolver code a bit by reducing the number of database
queries used while walking the tree for conflicts.

* subversion/libsvn_wc/conflicts.c
  (recursive_resolve_conflict): Add this_is_conflicted boolean. Use a single
    read in the loop instead of two and pass information to the callee, to
    avoid another db operation.
  (svn_wc_resolved_conflict5): Update caller. Add a single read to call
    recursive_resolve_conflict with its initial information.


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

wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion