You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ka...@apache.org on 2010/02/02 11:19:47 UTC
svn commit: r905564 - in /subversion/branches/1.6.x-r905326: ./ CHANGES
subversion/libsvn_ra_serf/commit.c
Author: kameshj
Date: Tue Feb 2 10:19:45 2010
New Revision: 905564
URL: http://svn.apache.org/viewvc?rev=905564&view=rev
Log:
* branches/1.6.x-r905326:
Merge r905326 from trunk, resolving conflicts.
Modified:
subversion/branches/1.6.x-r905326/ (props changed)
subversion/branches/1.6.x-r905326/CHANGES (props changed)
subversion/branches/1.6.x-r905326/subversion/libsvn_ra_serf/commit.c
Propchange: subversion/branches/1.6.x-r905326/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 2 10:19:45 2010
@@ -54,4 +54,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,900797
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,900797,905326
Propchange: subversion/branches/1.6.x-r905326/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 2 10:19:45 2010
@@ -53,4 +53,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365
+/subversion/trunk/CHANGES:875962-901365,905326
Modified: subversion/branches/1.6.x-r905326/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r905326/subversion/libsvn_ra_serf/commit.c?rev=905564&r1=905563&r2=905564&view=diff
==============================================================================
--- subversion/branches/1.6.x-r905326/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.6.x-r905326/subversion/libsvn_ra_serf/commit.c Tue Feb 2 10:19:45 2010
@@ -82,8 +82,8 @@
/* The checked-in root to base CHECKOUTs from */
const char *checked_in_url;
- /* The root baseline collection */
- const char *baseline_url;
+ /* vcc url */
+ const char *vcc_url;
/* Deleted files - so we can detect delete+add (replace) ops. */
apr_hash_t *deleted_entries;
@@ -248,6 +248,7 @@
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:href");
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:activity-set");
+ svn_ra_serf__add_tag_buckets(body_bkt, "D:apply-to-version", NULL, alloc);
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:checkout");
return body_bkt;
@@ -376,7 +377,7 @@
*/
if (!dir->parent_dir && !dir->commit->baseline)
{
- checkout_ctx->checkout_url = dir->commit->baseline_url;
+ checkout_ctx->checkout_url = dir->commit->vcc_url;
dir->commit->baseline = checkout_ctx;
}
else
@@ -986,14 +987,11 @@
{
commit_context_t *ctx = edit_baton;
svn_ra_serf__options_context_t *opt_ctx;
- svn_ra_serf__propfind_context_t *propfind_ctx;
svn_ra_serf__handler_t *handler;
svn_ra_serf__simple_request_context_t *mkact_ctx;
proppatch_context_t *proppatch_ctx;
dir_context_t *dir;
const char *activity_str;
- const char *vcc_url;
- apr_hash_t *props;
apr_hash_index_t *hi;
svn_error_t *err;
@@ -1056,31 +1054,11 @@
ctx->session->repos_url.hostinfo);
}
- SVN_ERR(svn_ra_serf__discover_root(&vcc_url, NULL,
+ SVN_ERR(svn_ra_serf__discover_root(&(ctx->vcc_url), NULL,
ctx->session, ctx->conn,
ctx->session->repos_url.path,
ctx->pool));
- /* Now go fetch our VCC and baseline so we can do a CHECKOUT. */
- props = apr_hash_make(ctx->pool);
- propfind_ctx = NULL;
- svn_ra_serf__deliver_props(&propfind_ctx, props, ctx->session,
- ctx->conn, vcc_url, SVN_INVALID_REVNUM, "0",
- checked_in_props, FALSE, NULL, ctx->pool);
-
- SVN_ERR(svn_ra_serf__wait_for_props(propfind_ctx, ctx->session, ctx->pool));
-
- ctx->baseline_url = svn_ra_serf__get_ver_prop(props, vcc_url,
- SVN_INVALID_REVNUM,
- "DAV:", "checked-in");
-
- if (!ctx->baseline_url)
- {
- return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
- _("The OPTIONS response did not include the "
- "requested checked-in value"));
- }
-
dir = apr_pcalloc(dir_pool, sizeof(*dir));
dir->pool = dir_pool;