Following on to r928438: unroll merge_props() completely this time. Lift the function contents to its one callsite.
Following on to r928438: unroll merge_props() completely this time. Lift
the function contents to its one callsite.

This is in preparation to reordering some of the work item queueing.

* subversion/libsvn_wc/update_editor.c:
  (merge_props): removed. guts were insert into ...
  (close_file): ... here. changed the svn_categorize_props() call to go
    ahead and return all categories. removed the call to merge_props and
    fixed up the new calls to svn_wc__merge_props and the dav_cache
    setting (noting the latter may be problematic).


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

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