Author: svn-role
Date: Thu Apr 18 04:01:01 2013
New Revision: 1469153
URL: http://svn.apache.org/r1469153
Log:
Merge r1468439 from trunk:
* r1468439
Fix assertion on checkout from pre-1.8 server over ra_serf with
http-bulk-updates=off.
Justification:
svn checkout fails.
Votes:
+1: ivan, rhuijben, philip
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_ra_serf/update.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1468439
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1469153&r1=1469152&r2=1469153&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Apr 18 04:01:01 2013
@@ -44,11 +44,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1468439
- Fix assertion on checkout from pre-1.8 server over ra_serf with
- http-bulk-updates=off.
- Justification:
- svn checkout fails.
- Votes:
- +1: ivan, rhuijben, philip
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/update.c?rev=1469153&r1=1469152&r2=1469153&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/update.c Thu Apr 18
04:01:01 2013
@@ -1024,26 +1024,6 @@ open_updated_file(report_info_t *info,
if (info->lock_token)
check_lock(info);
- /* Set all of the properties we received */
- SVN_ERR(svn_ra_serf__walk_all_props(info->props,
- info->base_name,
- info->base_rev,
- set_file_props, info,
- scratch_pool));
- SVN_ERR(svn_ra_serf__walk_all_props(info->dir->removed_props,
- info->base_name,
- info->base_rev,
- remove_file_props, info,
- scratch_pool));
- if (info->fetch_props)
- {
- SVN_ERR(svn_ra_serf__walk_all_props(info->props,
- info->url,
- ctx->target_rev,
- set_file_props, info,
- scratch_pool));
- }
-
/* Get (maybe) a textdelta window handler for transmitting file
content changes. */
if (info->fetch_file || force_apply_textdelta)
@@ -1064,6 +1044,28 @@ static svn_error_t *
close_updated_file(report_info_t *info,
apr_pool_t *scratch_pool)
{
+ report_context_t *ctx = info->dir->report_context;
+
+ /* Set all of the properties we received */
+ SVN_ERR(svn_ra_serf__walk_all_props(info->props,
+ info->base_name,
+ info->base_rev,
+ set_file_props, info,
+ scratch_pool));
+ SVN_ERR(svn_ra_serf__walk_all_props(info->dir->removed_props,
+ info->base_name,
+ info->base_rev,
+ remove_file_props, info,
+ scratch_pool));
+ if (info->fetch_props)
+ {
+ SVN_ERR(svn_ra_serf__walk_all_props(info->props,
+ info->url,
+ ctx->target_rev,
+ set_file_props, info,
+ scratch_pool));
+ }
+
/* Close the file via the editor. */
SVN_ERR(info->dir->report_context->update_editor->close_file(
info->file_baton, info->final_checksum, scratch_pool));
