You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/05 17:04:38 UTC
svn commit: r1154255 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_serf/commit.c
Author: hwright
Date: Fri Aug 5 15:04:38 2011
New Revision: 1154255
URL: http://svn.apache.org/viewvc?rev=1154255&view=rev
Log:
Merge r1153138, r1153141 from trunk:
* r1153138, r1153141
Don't CHECKOUT added directories when using a HTTPv1 server.
Justification:
Getting a HTTP 500 error while committing new directories is not nice.
Notes:
r1153141 removes an accidentally added SVN_DBG() from r1153138.
Votes:
+1: rhuijben, gstein, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 5 15:04:38 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153416,1153799,1153807,1153968,1154023
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154255&r1=1154254&r2=1154255&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug 5 15:04:38 2011
@@ -144,12 +144,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1153138, r1153141
- Don't CHECKOUT added directories when using a HTTPv1 server.
- Justification:
- Getting a HTTP 500 error while committing new directories is not nice.
- Notes:
- r1153141 removes an accidentally added SVN_DBG() from r1153138.
- Votes:
- +1: rhuijben, gstein, philip
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c?rev=1154255&r1=1154254&r2=1154255&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c Fri Aug 5 15:04:38 2011
@@ -355,19 +355,18 @@ checkout_dir(dir_context_t *dir)
checkout_context_t *checkout_ctx;
svn_ra_serf__handler_t *handler;
svn_error_t *err;
- dir_context_t *parent_dir = dir->parent_dir;
+ dir_context_t *p_dir = dir;
if (dir->checkout)
{
return SVN_NO_ERROR;
}
- /* Is one of our parent dirs newly added? If so, we're already
- * implicitly checked out.
- */
- while (parent_dir)
+ /* Is this directory or one of our parent dirs newly added?
+ * If so, we're already implicitly checked out. */
+ while (p_dir)
{
- if (parent_dir->added)
+ if (p_dir->added)
{
/* Implicitly checkout this dir now. */
dir->checkout = apr_pcalloc(dir->pool, sizeof(*dir->checkout));
@@ -381,7 +380,7 @@ checkout_dir(dir_context_t *dir)
return SVN_NO_ERROR;
}
- parent_dir = parent_dir->parent_dir;
+ p_dir = p_dir->parent_dir;
}
/* Checkout our directory into the activity URL now. */