You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/10/24 14:21:44 UTC
svn commit: r1188113 [2/4] - in /subversion/branches/showing-merge-info: ./
build/ac-macros/ subversion/include/ subversion/include/private/
subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_fs_fs/
subversion/libsvn_repos/ subversion...
Modified: subversion/branches/showing-merge-info/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_wc/update_editor.c?rev=1188113&r1=1188112&r2=1188113&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_wc/update_editor.c Mon Oct 24 12:21:42 2011
@@ -1192,6 +1192,7 @@ modcheck_callback(void *baton,
switch (status->node_status)
{
case svn_wc_status_normal:
+ case svn_wc_status_incomplete:
case svn_wc_status_ignored:
case svn_wc_status_none:
case svn_wc_status_unversioned:
@@ -4261,28 +4262,28 @@ close_file(void *file_baton,
if (!fb->shadowed
&& (! fb->adding_file || fb->add_existed))
{
- svn_boolean_t local_is_link = FALSE;
- svn_boolean_t incoming_is_link = FALSE;
+ svn_boolean_t local_is_link;
+ svn_boolean_t incoming_is_link;
+ int i;
local_is_link = apr_hash_get(local_actual_props,
SVN_PROP_SPECIAL,
APR_HASH_KEY_STRING) != NULL;
- {
- int i;
-
- for (i = 0; i < regular_prop_changes->nelts; ++i)
- {
- const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
- svn_prop_t);
+ incoming_is_link = local_is_link;
- if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
- {
- incoming_is_link = TRUE;
- }
- }
- }
+ /* Does an incoming propchange affect symlink-ness? */
+ for (i = 0; i < regular_prop_changes->nelts; ++i)
+ {
+ const svn_prop_t *prop = &APR_ARRAY_IDX(regular_prop_changes, i,
+ svn_prop_t);
+ if (strcmp(prop->name, SVN_PROP_SPECIAL) == 0)
+ {
+ incoming_is_link = (prop->value != NULL);
+ break;
+ }
+ }
if (local_is_link != incoming_is_link)
{
@@ -4292,15 +4293,12 @@ close_file(void *file_baton,
fb->obstruction_found = TRUE;
fb->add_existed = FALSE;
- /* ### Performance: We should just create the conflict here, without
- ### verifying again */
- SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath,
- svn_wc__db_status_added,
- svn_kind_file, TRUE,
- svn_wc_conflict_action_add,
- svn_node_file, fb->new_relpath, NULL,
- scratch_pool, scratch_pool));
- SVN_ERR_ASSERT(tree_conflict != NULL);
+ SVN_ERR(create_tree_conflict(&tree_conflict, eb,
+ fb->local_abspath,
+ svn_wc_conflict_reason_added,
+ svn_wc_conflict_action_add,
+ svn_node_file, fb->new_relpath,
+ scratch_pool, scratch_pool));
SVN_ERR(svn_wc__db_op_set_tree_conflict(eb->db,
fb->local_abspath,
tree_conflict,
Modified: subversion/branches/showing-merge-info/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_wc/wc_db.c?rev=1188113&r1=1188112&r2=1188113&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_wc/wc_db.c Mon Oct 24 12:21:42 2011
@@ -9665,6 +9665,7 @@ scan_addition_txn(void *baton,
{
SVN_ERR_ASSERT(*sab->status == svn_wc__db_status_added
|| *sab->status == svn_wc__db_status_copied
+ || *sab->status == svn_wc__db_status_incomplete
|| *sab->status == svn_wc__db_status_moved_here);
if (*sab->status == svn_wc__db_status_added)
{
@@ -9918,8 +9919,8 @@ scan_deletion_txn(void *baton,
local_relpath,
scratch_pool));
- /* ### incomplete not handled */
SVN_ERR_ASSERT(work_presence == svn_wc__db_status_normal
+ || work_presence == svn_wc__db_status_incomplete
|| work_presence == svn_wc__db_status_not_present
|| work_presence == svn_wc__db_status_base_deleted);
Modified: subversion/branches/showing-merge-info/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_wc/workqueue.c?rev=1188113&r1=1188112&r2=1188113&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_wc/workqueue.c Mon Oct 24 12:21:42 2011
@@ -149,7 +149,8 @@ remove_base_node(svn_wc__db_t *db,
/* Children first */
if (base_kind == svn_kind_dir
- && base_status == svn_wc__db_status_normal)
+ && (base_status == svn_wc__db_status_normal
+ || base_status == svn_wc__db_status_incomplete))
{
const apr_array_header_t *children;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
Modified: subversion/branches/showing-merge-info/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/mod_dav_svn/mod_dav_svn.c?rev=1188113&r1=1188112&r2=1188113&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/showing-merge-info/subversion/mod_dav_svn/mod_dav_svn.c Mon Oct 24 12:21:42 2011
@@ -902,13 +902,17 @@ merge_xml_in_filter(ap_filter_t *f,
/* Response handler for POST requests (protocol-v2 commits). */
static int dav_svn__handler(request_rec *r)
{
- /* HTTP-defined Methods we handle */
- r->allowed = 0
- | (AP_METHOD_BIT << M_POST);
-
- if (r->method_number == M_POST) {
- return dav_svn__method_post(r);
- }
+ dir_conf_t *conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
+
+ if (conf->fs_path || conf->fs_parent_path)
+ {
+ /* HTTP-defined Methods we handle */
+ r->allowed = 0
+ | (AP_METHOD_BIT << M_POST);
+
+ if (r->method_number == M_POST)
+ return dav_svn__method_post(r);
+ }
return DECLINED;
}