You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2011/05/21 20:05:57 UTC
svn commit: r1125758 - /subversion/trunk/subversion/libsvn_ra_neon/commit.c
Author: ivan
Date: Sat May 21 18:05:57 2011
New Revision: 1125758
URL: http://svn.apache.org/viewvc?rev=1125758&view=rev
Log:
* subversion/libsvn_ra_neon/commit.c
(commit_add_file): Fetch only DAV:resourcetype property when checking that
file doesn't before putting it in transaction.
Modified:
subversion/trunk/subversion/libsvn_ra_neon/commit.c
Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1125758&r1=1125757&r2=1125758&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Sat May 21 18:05:57 2011
@@ -1178,16 +1178,21 @@ static svn_error_t * commit_add_file(con
if ((! parent->created)
&& (! apr_hash_get(file->cc->valid_targets, path, APR_HASH_KEY_STRING)))
{
+ static const ne_propname restype_props[] =
+ {
+ { "DAV:", "resourcetype" },
+ { NULL }
+ };
svn_ra_neon__resource_t *res;
const char *public_url;
svn_error_t *err1, *err2;
public_url = svn_path_url_add_component2(file->cc->ras->url->data,
path, workpool);
- err1 = svn_ra_neon__get_starting_props(&res, file->cc->ras,
- put_target, workpool);
- err2 = svn_ra_neon__get_starting_props(&res, file->cc->ras,
- public_url, workpool);
+ err1 = svn_ra_neon__get_props_resource(&res, parent->cc->ras, put_target,
+ NULL, restype_props, workpool);
+ err2 = svn_ra_neon__get_props_resource(&res, parent->cc->ras, public_url,
+ NULL, restype_props, workpool);
if (! err1 && ! err2)
{
/* If the PROPFINDs succeed the file already exists */
Re: svn commit: r1125758 - /subversion/trunk/subversion/libsvn_ra_neon/commit.c
Posted by Greg Stein <gs...@gmail.com>.
Yup, thanks!
On May 21, 2011 10:55 PM, "Ivan Zhakov" <iv...@visualsvn.com> wrote:
> On Sat, May 21, 2011 at 22:44, Greg Stein <gs...@gmail.com> wrote:
>> On May 21, 2011 8:06 PM, <iv...@apache.org> wrote:
>>>
>>> Author: ivan
>>> Date: Sat May 21 18:05:57 2011
>>> New Revision: 1125758
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1125758&view=rev
>>> Log:
>>> * subversion/libsvn_ra_neon/commit.c
>>> (commit_add_file): Fetch only DAV:resourcetype property when checking
>> that
>>> file doesn't before putting it in transaction.
>>
>> Can you redo that log message? It doesn't make any sense to me...
>>
> Sorry, is the following makes more sense?
> [[
> * subversion/libsvn_ra_neon/commit.c
> (commit_add_file): Fetch only DAV:resourcetype property to check
> whether file exists or not in transaction.
> ]]]
>
>
> --
> Ivan Zhakov
Re: svn commit: r1125758 - /subversion/trunk/subversion/libsvn_ra_neon/commit.c
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On Sat, May 21, 2011 at 22:44, Greg Stein <gs...@gmail.com> wrote:
> On May 21, 2011 8:06 PM, <iv...@apache.org> wrote:
>>
>> Author: ivan
>> Date: Sat May 21 18:05:57 2011
>> New Revision: 1125758
>>
>> URL: http://svn.apache.org/viewvc?rev=1125758&view=rev
>> Log:
>> * subversion/libsvn_ra_neon/commit.c
>> (commit_add_file): Fetch only DAV:resourcetype property when checking
> that
>> file doesn't before putting it in transaction.
>
> Can you redo that log message? It doesn't make any sense to me...
>
Sorry, is the following makes more sense?
[[
* subversion/libsvn_ra_neon/commit.c
(commit_add_file): Fetch only DAV:resourcetype property to check
whether file exists or not in transaction.
]]]
--
Ivan Zhakov
Re: svn commit: r1125758 - /subversion/trunk/subversion/libsvn_ra_neon/commit.c
Posted by Greg Stein <gs...@gmail.com>.
On May 21, 2011 8:06 PM, <iv...@apache.org> wrote:
>
> Author: ivan
> Date: Sat May 21 18:05:57 2011
> New Revision: 1125758
>
> URL: http://svn.apache.org/viewvc?rev=1125758&view=rev
> Log:
> * subversion/libsvn_ra_neon/commit.c
> (commit_add_file): Fetch only DAV:resourcetype property when checking
that
> file doesn't before putting it in transaction.
Can you redo that log message? It doesn't make any sense to me...
Thanks,
-g