Author: pburba
Date: Thu Sep 6 14:54:37 2012
New Revision: 1381631
URL: http://svn.apache.org/viewvc?rev=1381631&view=rev
Log:
On the inheritable-props branch: Don't ask the repos for iprops when proplist
didn't for them in the first place.
* subversion/libsvn_client/prop_commands.c
(svn_client_proplist4): Disentangle the fact that WC can't provide iprops
from whether we want them *at all*.
Modified:
subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
Modified:
subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
URL:
http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c?rev=1381631&r1=1381630&r2=1381631&view=diff
==============================================================================
---
subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
(original)
+++
subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
Thu Sep 6 14:54:37 2012
@@ -1540,7 +1540,8 @@ svn_client_proplist4(const char *path_or
|| !local_explicit_props)
{
SVN_ERR(get_remote_props(path_or_url, peg_revision, revision, depth,
- !local_explicit_props, !local_iprops,
+ !local_explicit_props,
+ (get_target_inherited_props && !local_iprops),
receiver, receiver_baton, ctx, result_pool,
scratch_pool));
}
