On the inheritable-props branch: Fix some ordering and omission bugs with proplist and propget when getting explicit props from the WC and iprops  from the repos.
On the inheritable-props branch: Fix some ordering and omission bugs with
proplist and propget when getting explicit props from the WC and iprops 
from the repos.

* subversion/libsvn_client/prop_commands.c

  (svn_client_propget5): Comment cleanup.  When contacting the repos for
   iprops, don't reallocate the *PROPS output argument because we'll wipe
   out the explicit props already obtained from the WC.

  (get_remote_props,
   get_local_props): New.

  (svn_client_proplist4): Refactor into the two new functions above.  Get
   the remote props first, to keep the ordering consistent.  Prior to this
   change if a proplist got explicit props locally and iprops from the
   server, then the local props were sent to the svn_proplist_receiver2_t
   callback first and the iprops came later.  This was inconsistent with
   the ordering of all propgets and proplists which obtained both explicit
   and inherited props from the WC xor the repos.
 

git-svn-id: ae8f6d14bbdc7ff690355f143f05114066724748@1381334 13f79535-47bb-0310-9956-ffa450edef68

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