You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2009/12/15 07:15:17 UTC
svn commit: r890658 [17/27] - in /subversion/branches/issue-3242-dev: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6.x...
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/deprecated.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/deprecated.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* "we can't lose 'em, but we can shun 'em!"
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/diff.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/diff.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/diff.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* repository.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -1462,17 +1462,24 @@
svn_stream_t *source;
svn_stream_t *temp_stream;
svn_error_t *err;
+ svn_boolean_t found;
err = svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, eb->db, fb->local_abspath, pool, pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- svn_error_clear(err);
+ {
+ svn_error_clear(err);
+ found = FALSE;
+ }
else
- SVN_ERR(err);
+ {
+ SVN_ERR(err);
+ found = TRUE;
+ }
- if (status == svn_wc__db_status_added)
+ if (found && status == svn_wc__db_status_added)
SVN_ERR(svn_wc__db_scan_addition(&status, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, eb->db,
fb->local_abspath, pool, pool));
@@ -1481,8 +1488,8 @@
/* If the node is added-with-history, then this is not actually
an add, but a modification. */
- if (status == svn_wc__db_status_copied ||
- status == svn_wc__db_status_moved_here)
+ if (found && (status == svn_wc__db_status_copied ||
+ status == svn_wc__db_status_moved_here))
fb->added = FALSE;
if (fb->added)
@@ -1554,10 +1561,9 @@
NULL, eb->db, fb->local_abspath, pool, pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
svn_error_clear(err);
- else
- SVN_ERR(err);
-
- if (status == svn_wc__db_status_added)
+ else if (err)
+ return err;
+ else if (status == svn_wc__db_status_added)
SVN_ERR(svn_wc__db_scan_addition(&status, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, eb->db,
fb->local_abspath, pool, pool));
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* entries.c : manipulating the administrative `entries' file.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/entries.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* entries.h : manipulating entries
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* lock.c: routines for locking working copy subdirectories.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -310,7 +310,7 @@
if (write_lock)
{
- SVN_ERR(svn_wc__db_wclock_set(db, lock->abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_wclock_set(db, lock->abspath, 0, scratch_pool));
SVN_ERR(svn_wc__db_temp_mark_locked(db, lock->abspath, scratch_pool));
}
@@ -858,106 +858,84 @@
const char *path,
apr_pool_t *pool)
{
- if (strcmp(associated->path, path) == 0)
- {
- *adm_access = associated;
- }
- else
- {
- const char *abspath;
-
- SVN_ERR(svn_dirent_get_absolute(&abspath, path, pool));
+ const char *local_abspath;
+ svn_wc__db_kind_t kind = svn_wc__db_kind_unknown;
+ svn_node_kind_t wckind;
+ svn_error_t *err;
- *adm_access = svn_wc__adm_retrieve_internal2(associated->db, abspath,
- pool);
+ SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- /* Relative paths can play stupid games with the lookup, and we might
- try to return the wrong baton. Look for that case, and zap it.
+ if (strcmp(associated->path, path) == 0)
+ *adm_access = associated;
+ else
+ *adm_access = svn_wc__adm_retrieve_internal2(associated->db, local_abspath,
+ pool);
- The specific case observed happened during "svn status .. -u -v".
- svn_wc_status2() would do dirname("..") returning "". When that
- came into this function, we'd map it to an absolute path and find
- it in the DB, then return it. The (apparently) *desired* behavior
- is to not find "" in the set of batons.
-
- Sigh. */
- if (*adm_access != NULL
- && strcmp(path, (*adm_access)->path) != 0)
- *adm_access = NULL;
- }
+ /* We found what we're looking for, so bail. */
+ if (*adm_access)
+ return SVN_NO_ERROR;
/* Most of the code expects access batons to exist, so returning an error
generally makes the calling code simpler as it doesn't need to check
for NULL batons. */
- if (! *adm_access)
- {
- /* We are going to send a SVN_ERR_WC_NOT_LOCKED, but let's provide
- a bit more information to our caller */
+ /* We are going to send a SVN_ERR_WC_NOT_LOCKED, but let's provide
+ a bit more information to our caller */
- const char *local_abspath;
- svn_wc__db_kind_t kind = svn_wc__db_kind_unknown;
- svn_node_kind_t wckind;
- svn_error_t *err;
+ err = svn_io_check_path(path, &wckind, pool);
- err = svn_io_check_path(path, &wckind, pool);
+ /* If we can't check the path, we can't make a good error message. */
+ if (err)
+ {
+ return svn_error_createf(SVN_ERR_WC_NOT_LOCKED, err,
+ _("Unable to check path existence for '%s'"),
+ svn_dirent_local_style(path, pool));
+ }
+
+ if (associated)
+ {
+ err = svn_wc__db_read_kind(&kind, svn_wc__adm_get_db(associated),
+ local_abspath, TRUE, pool);
- /* If we can't check the path, we can't make a good error
- message. */
if (err)
{
- return svn_error_createf(SVN_ERR_WC_NOT_LOCKED, err,
- _("Unable to check path existence for '%s'"),
- svn_dirent_local_style(path, pool));
+ kind = svn_wc__db_kind_unknown;
+ svn_error_clear(err);
}
+ }
- SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
-
- if (associated)
- {
- err = svn_wc__db_read_kind(&kind, svn_wc__adm_get_db(associated),
- local_abspath, TRUE, pool);
-
- if (err)
- {
- kind = svn_wc__db_kind_unknown;
- svn_error_clear(err);
- }
- }
+ if (kind == svn_wc__db_kind_dir && wckind == svn_node_file)
+ {
+ err = svn_error_createf(
+ SVN_ERR_WC_NOT_WORKING_COPY, NULL,
+ _("Expected '%s' to be a directory but found a file"),
+ svn_dirent_local_style(path, pool));
- if (kind == svn_wc__db_kind_dir && wckind == svn_node_file)
- {
- err = svn_error_createf(
- SVN_ERR_WC_NOT_WORKING_COPY, NULL,
- _("Expected '%s' to be a directory but found a file"),
- svn_dirent_local_style(path, pool));
+ return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
+ }
- return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
- }
- else if (kind != svn_wc__db_kind_dir && kind != svn_wc__db_kind_unknown)
- {
- err = svn_error_createf(
- SVN_ERR_WC_NOT_WORKING_COPY, NULL,
- _("Can't retrieve an access baton for non-directory '%s'"),
- svn_dirent_local_style(path, pool));
+ if (kind != svn_wc__db_kind_dir && kind != svn_wc__db_kind_unknown)
+ {
+ err = svn_error_createf(
+ SVN_ERR_WC_NOT_WORKING_COPY, NULL,
+ _("Can't retrieve an access baton for non-directory '%s'"),
+ svn_dirent_local_style(path, pool));
- return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
- }
- else if (kind == svn_wc__db_kind_unknown || wckind == svn_node_none)
- {
- err = svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- _("Directory '%s' is missing"),
- svn_dirent_local_style(path, pool));
+ return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
+ }
- return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
- }
+ if (kind == svn_wc__db_kind_unknown || wckind == svn_node_none)
+ {
+ err = svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
+ _("Directory '%s' is missing"),
+ svn_dirent_local_style(path, pool));
- /* If all else fails, return our useless generic error. */
- return svn_error_createf(SVN_ERR_WC_NOT_LOCKED, NULL,
- _("Working copy '%s' is not locked"),
- svn_dirent_local_style(path, pool));
+ return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
}
- return SVN_NO_ERROR;
+ /* If all else fails, return our useless generic error. */
+ return svn_error_createf(SVN_ERR_WC_NOT_LOCKED, NULL,
+ _("Working copy '%s' is not locked"),
+ svn_dirent_local_style(path, pool));
}
@@ -1744,3 +1722,122 @@
}
}
+
+svn_error_t *
+svn_wc__acquire_write_lock(const char **anchor_abspath,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ svn_wc__db_kind_t kind;
+ apr_pool_t *iterpool;
+ const apr_array_header_t *children;
+ svn_boolean_t parent_is_anchor = FALSE;
+ int i;
+
+ if (anchor_abspath)
+ {
+ const char *parent_abspath, *base;
+ svn_error_t *err;
+
+ svn_dirent_split(local_abspath, &parent_abspath, &base, scratch_pool);
+ err = svn_wc__db_read_children(&children, wc_ctx->db, parent_abspath,
+ scratch_pool, scratch_pool);
+ if (err)
+ svn_error_clear(err);
+ else
+ {
+ for (i = 0; i < children->nelts; ++i)
+ if (! strcmp(APR_ARRAY_IDX(children, i, const char *), base))
+ break;
+ if (i < children->nelts)
+ parent_is_anchor = TRUE;
+ }
+ local_abspath = parent_is_anchor ? parent_abspath : local_abspath;
+ *anchor_abspath = apr_pstrdup(result_pool, local_abspath);
+ }
+
+ if (! parent_is_anchor)
+ {
+ SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, TRUE,
+ scratch_pool));
+ if (kind != svn_wc__db_kind_dir)
+ local_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
+
+ SVN_ERR(svn_wc__db_read_children(&children, wc_ctx->db, local_abspath,
+ scratch_pool, scratch_pool));
+ }
+
+ /* The current lock paradigm is that each directory holds a lock for itself,
+ and there are no inherited locks. In the eventual wc-ng paradigm, a
+ lock on a directory, would imply a infinite-depth lock on the children.
+ But since we aren't quite there yet, we do the infinite locking
+ manually (and be sure to release them in svn_wc__release_write_lock(). */
+
+ iterpool = svn_pool_create(scratch_pool);
+ for (i = 0; i < children->nelts; i ++)
+ {
+ const char *child_relpath = APR_ARRAY_IDX(children, i, const char *);
+ const char *child_abspath;
+
+ svn_pool_clear(iterpool);
+ child_abspath = svn_dirent_join(local_abspath, child_relpath, iterpool);
+
+ SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, child_abspath, FALSE,
+ iterpool));
+ if (kind == svn_wc__db_kind_dir)
+ SVN_ERR(svn_wc__acquire_write_lock(NULL, wc_ctx, child_abspath,
+ NULL, iterpool));
+ }
+
+ SVN_ERR(svn_wc__db_wclock_set(wc_ctx->db, local_abspath, 0, iterpool));
+ SVN_ERR(svn_wc__db_temp_mark_locked(wc_ctx->db, local_abspath, iterpool));
+
+ svn_pool_destroy(iterpool);
+
+ return SVN_NO_ERROR;
+}
+
+
+svn_error_t *
+svn_wc__release_write_lock(svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
+{
+ svn_wc__db_kind_t kind;
+ apr_pool_t *iterpool;
+ const apr_array_header_t *children;
+ int i;
+
+ SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, TRUE,
+ scratch_pool));
+ if (kind != svn_wc__db_kind_dir)
+ local_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
+
+ /* We need to recursively remove locks (see comment in
+ svn_wc__acquire_write_lock(). */
+
+ SVN_ERR(svn_wc__db_read_children(&children, wc_ctx->db, local_abspath,
+ scratch_pool, scratch_pool));
+ iterpool = svn_pool_create(scratch_pool);
+ for (i = 0; i < children->nelts; i ++)
+ {
+ const char *child_relpath = APR_ARRAY_IDX(children, i, const char *);
+ const char *child_abspath;
+
+ svn_pool_clear(iterpool);
+ child_abspath = svn_dirent_join(local_abspath, child_relpath, iterpool);
+
+ SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, child_abspath, FALSE,
+ iterpool));
+ if (kind == svn_wc__db_kind_dir)
+ SVN_ERR(svn_wc__release_write_lock(wc_ctx, child_abspath, iterpool));
+ }
+
+ SVN_ERR(svn_wc__db_wclock_remove(wc_ctx->db, local_abspath, iterpool));
+
+ svn_pool_destroy(iterpool);
+
+ return SVN_NO_ERROR;
+}
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/lock.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* lock.h: routines for locking working copy subdirectories.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* log.c: handle the adm area's log file.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -1374,7 +1374,7 @@
SVN_ERR(can_be_cleaned(&wc_format, db, adm_abspath, iterpool));
/* Lock this working copy directory, or steal an existing lock */
- err = svn_wc__db_wclock_set(db, adm_abspath, iterpool);
+ err = svn_wc__db_wclock_set(db, adm_abspath, 0, iterpool);
if (err && err->apr_err == SVN_ERR_WC_LOCKED)
svn_error_clear(err);
else if (err)
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/log.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* log.h : interfaces for running .svn/log files.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/merge.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/merge.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/merge.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* merge.c: merging changes into a working file
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/node.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/node.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* node.c: routines for getting information about nodes in the working copy.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/old-and-busted.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/old-and-busted.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* old-and-busted.c: routines for reading pre-1.7 working copies.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* props.c : routines dealing with properties in the working copy
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/props.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* props.h : properties
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/questions.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/questions.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/questions.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* questions.c: routines for asking questions about working copies
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/relocate.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/relocate.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/relocate.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/relocate.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* relocate.c: do wc repos relocation
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/revision_status.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/revision_status.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/revision_status.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/revision_status.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* revision_status.c: report the revision range and status of a working copy
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -67,10 +67,13 @@
sb->result->max_rev = item_rev;
}
- sb->result->switched |= status->switched;
- sb->result->modified |= (status->text_status != svn_wc_status_normal);
- sb->result->modified |= (status->prop_status != svn_wc_status_normal
- && status->prop_status != svn_wc_status_none);
+ if (status->entry->depth != svn_depth_exclude)
+ {
+ sb->result->switched |= status->switched;
+ sb->result->modified |= (status->text_status != svn_wc_status_normal);
+ sb->result->modified |= (status->prop_status != svn_wc_status_normal
+ && status->prop_status != svn_wc_status_none);
+ }
sb->result->sparse_checkout |= (status->entry->depth != svn_depth_infinity);
if (sb->local_abspath
@@ -118,6 +121,7 @@
svn_depth_infinity,
TRUE /* get_all */,
FALSE /* no_ignore */,
+ TRUE, /* get_excluded */
NULL /* ignore_patterns */,
analyze_status, &sb,
NULL, NULL,
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/status.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/status.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* status.c: construct a status structure from an entry structure
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -800,6 +800,7 @@
svn_boolean_t get_all,
svn_boolean_t no_ignore,
svn_boolean_t skip_this_dir,
+ svn_boolean_t get_excluded,
svn_wc_status_func4_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
@@ -821,6 +822,7 @@
svn_depth_t depth,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
+ svn_boolean_t get_excluded,
svn_wc_status_func4_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
@@ -839,8 +841,8 @@
{
SVN_ERR(get_dir_status(wb, local_abspath, dir_entry, NULL, ignores,
depth, get_all, no_ignore, FALSE,
- status_func, status_baton, cancel_func,
- cancel_baton, pool));
+ get_excluded, status_func, status_baton,
+ cancel_func, cancel_baton, pool));
}
else
{
@@ -925,6 +927,9 @@
status will not be reported. However, upon recursing, all subdirs
*will* be reported, regardless of this parameter's value.
+ If GET_EXCLUDED is TRUE, then statuses for the roots of excluded
+ subtrees are reported, otherwise they are ignored.
+
Other arguments are the same as those passed to
svn_wc_get_status_editor5(). */
static svn_error_t *
@@ -937,6 +942,7 @@
svn_boolean_t get_all,
svn_boolean_t no_ignore,
svn_boolean_t skip_this_dir,
+ svn_boolean_t get_excluded,
svn_wc_status_func4_t status_func,
void *status_baton,
svn_cancel_func_t cancel_func,
@@ -1057,7 +1063,7 @@
SVN_ERR(svn_wc__db_node_hidden(&hidden, wb->db, node_abspath,
iterpool));
- if (!hidden)
+ if (!hidden || get_excluded)
{
err = svn_wc__get_entry(&entry, wb->db, node_abspath, FALSE,
dirent_p ? dirent_p->kind
@@ -1103,7 +1109,7 @@
? depth
: svn_depth_empty,
get_all,
- no_ignore,
+ no_ignore, get_excluded,
status_func, status_baton,
cancel_func, cancel_baton, iterpool));
continue;
@@ -1462,8 +1468,8 @@
status_in_parent->entry, NULL,
ignores, d->depth == svn_depth_files ?
svn_depth_files : svn_depth_immediates,
- TRUE, TRUE, TRUE, hash_stash, d->statii, NULL,
- NULL, pool));
+ TRUE, TRUE, TRUE, FALSE, hash_stash, d->statii,
+ NULL, NULL, pool));
/* If we found a depth here, it should govern. */
this_dir_status = apr_hash_get(d->statii, d->local_abspath,
@@ -1647,7 +1653,7 @@
local_abspath,
dir_entry, NULL,
ignores, depth, eb->get_all,
- eb->no_ignore, TRUE, status_func,
+ eb->no_ignore, TRUE, FALSE, status_func,
status_baton, eb->cancel_func,
eb->cancel_baton, subpool));
}
@@ -1903,6 +1909,7 @@
tgt_status->entry, NULL,
eb->ignores, eb->default_depth,
eb->get_all, eb->no_ignore, TRUE,
+ FALSE,
eb->status_func, eb->status_baton,
eb->cancel_func, eb->cancel_baton,
pool));
@@ -2084,6 +2091,7 @@
eb->default_depth,
eb->get_all,
eb->no_ignore,
+ FALSE,
eb->ignores,
eb->status_func,
eb->status_baton,
@@ -2204,6 +2212,7 @@
svn_depth_t depth,
svn_boolean_t get_all,
svn_boolean_t no_ignore,
+ svn_boolean_t get_excluded,
const apr_array_header_t *ignore_patterns,
svn_wc_status_func4_t status_func,
void *status_baton,
@@ -2248,6 +2257,7 @@
get_all,
TRUE,
TRUE,
+ get_excluded,
status_func,
status_baton,
cancel_func,
@@ -2265,6 +2275,7 @@
get_all,
no_ignore,
FALSE,
+ get_excluded,
status_func,
status_baton,
cancel_func,
@@ -2282,6 +2293,7 @@
get_all,
no_ignore,
TRUE,
+ get_excluded,
status_func,
status_baton,
cancel_func,
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* translate.c : wc-specific eol/keyword substitution
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/translate.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* translate.h : eol and keyword translation
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* tree_conflicts.c: Storage of tree conflict descriptions in the WC.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/tree_conflicts.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* tree_conflicts.h: declarations related to tree conflicts
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/update_editor.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/update_editor.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* update_editor.c : main editor for checkouts and updates
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -1165,7 +1165,7 @@
adm_access_pool = svn_wc_adm_access_pool(db->edit_baton->adm_access);
SVN_ERR(svn_wc__adm_open_in_context(&adm_access, db->edit_baton->wc_ctx,
- rel_path, TRUE, 0,
+ rel_path, TRUE, -1,
db->edit_baton->cancel_func,
db->edit_baton->cancel_baton,
adm_access_pool));
@@ -3196,15 +3196,19 @@
const char *local_abspath;
struct dir_baton *pb = parent_baton;
struct edit_baton *eb = pb->edit_baton;
- svn_wc_entry_t tmp_entry;
- svn_boolean_t in_parent = (kind == svn_node_dir);
+ const char *repos_relpath;
+ const char *repos_root_url;
+ const char *repos_uuid;
+ svn_wc__db_kind_t db_kind
+ = kind == svn_node_dir ? svn_wc__db_kind_dir : svn_wc__db_kind_file;
local_abspath = svn_dirent_join(pb->local_abspath, name, pool);
+
/* Extra check: an item by this name may not exist, but there may
still be one scheduled for addition. That's a genuine
tree-conflict. */
-
{
+ svn_boolean_t in_parent = (kind == svn_node_dir);
const svn_wc_entry_t *entry;
svn_boolean_t hidden;
SVN_ERR(svn_wc__get_entry(&entry, eb->db, local_abspath, TRUE, kind,
@@ -3222,31 +3226,18 @@
svn_dirent_local_style(path, pool));
}
- /* Immediately create an entry for the new item in the parent. Note
- that the parent must already be either added or opened, and thus
- it's in an 'incomplete' state just like the new item. */
- tmp_entry.kind = kind;
-
- /* Note that there may already exist a 'ghost' entry in the parent
- with the same name, in a 'deleted' state. If so, it's fine to
- overwrite it... but we need to make sure we get rid of the
- 'deleted' flag when doing so: */
- tmp_entry.deleted = FALSE;
-
- /* Post-update processing knows to leave this entry if its revision
- is equal to the target revision of the overall update. */
- tmp_entry.revision = *(eb->target_revision);
+ SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url,
+ &repos_uuid, eb->db, pb->local_abspath,
+ pool, pool));
+ repos_relpath = svn_dirent_join(repos_relpath, name, pool);
- /* And, of course, marking as absent is the whole point. */
- tmp_entry.absent = TRUE;
+ SVN_ERR(svn_wc__db_base_add_absent_node(eb->db, local_abspath,
+ repos_relpath, repos_root_url,
+ repos_uuid, *(eb->target_revision),
+ db_kind, svn_wc__db_status_absent,
+ pool));
- return svn_wc__entry_modify2(eb->db, local_abspath, kind, in_parent,
- &tmp_entry,
- (SVN_WC__ENTRY_MODIFY_KIND |
- SVN_WC__ENTRY_MODIFY_REVISION |
- SVN_WC__ENTRY_MODIFY_DELETED |
- SVN_WC__ENTRY_MODIFY_ABSENT),
- pool);
+ return SVN_NO_ERROR;
}
@@ -3355,8 +3346,6 @@
ancestor_relpath = svn_relpath_get_longest_ancestor(dir_repos_relpath,
copyfrom_relpath,
scratch_pool);
- if (strlen(ancestor_relpath) == 0)
- return SVN_NO_ERROR;
/* Move 'up' the working copy to what ought to be the common ancestor dir. */
levels_up = svn_path_component_count(dir_repos_relpath)
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/upgrade.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/upgrade.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* upgrade.c: routines for upgrading a working copy
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -377,7 +377,7 @@
function bumps a working copy all the way to current. */
SVN_ERR(svn_wc__db_temp_reset_format(SVN_WC__VERSION, db, dir_abspath,
scratch_pool));
- SVN_ERR(svn_wc__db_wclock_set(db, dir_abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_wclock_set(db, dir_abspath, 0, scratch_pool));
SVN_ERR(svn_wc__write_upgraded_entries(db, sdb, repos_id, wc_id,
dir_abspath, entries,
scratch_pool));
@@ -743,6 +743,7 @@
if (node is replaced):
revert -> BASE
working -> ACTUAL
+ base -> WORKING
else if (prop pristine is working [as defined in props.c] ):
base -> WORKING
working -> ACTUAL
@@ -781,6 +782,7 @@
svn_boolean_t pristine_is_working;
svn_boolean_t replaced;
apr_hash_t *working_props;
+ apr_hash_t *base_props;
svn_stream_t *stream;
svn_pool_clear(iterpool);
@@ -800,6 +802,12 @@
child_relpath),
iterpool);
+ base_props = apr_hash_make(iterpool);
+ SVN_ERR(svn_stream_open_readonly(&stream, prop_base_path, iterpool,
+ iterpool));
+ SVN_ERR(svn_hash_read2(base_props, stream, SVN_HASH_TERMINATOR,
+ iterpool));
+
/* if node is replaced ... */
SVN_ERR(svn_wc__internal_is_replaced(&replaced, db, child_abspath,
iterpool));
@@ -815,16 +823,12 @@
SVN_ERR(svn_wc__db_temp_op_set_pristine_props(db, child_abspath,
revert_props, FALSE,
iterpool));
+ SVN_ERR(svn_wc__db_temp_op_set_pristine_props(db, child_abspath,
+ base_props, TRUE,
+ iterpool));
}
else
{
- apr_hash_t *base_props = apr_hash_make(iterpool);
-
- SVN_ERR(svn_stream_open_readonly(&stream, prop_base_path, iterpool,
- iterpool));
- SVN_ERR(svn_hash_read2(base_props, stream, SVN_HASH_TERMINATOR,
- iterpool));
-
SVN_ERR(svn_wc__prop_pristine_is_working(&pristine_is_working, db,
child_abspath, iterpool));
SVN_ERR(svn_wc__db_temp_op_set_pristine_props(db, child_abspath,
@@ -929,13 +933,18 @@
++start_format;
case 15:
- SVN_ERR(migrate_props(wcroot_abspath, sdb, scratch_pool));
+ /* Nothing to do here for format 16 */
SVN_ERR(svn_sqlite__set_schema_version(sdb, 16, scratch_pool));
++start_format;
#if 0
case 16:
- SVN_ERR(bump_to_16(wcroot_abspath, sdb, scratch_pool));
+ SVN_ERR(migrate_props(wcroot_abspath, sdb, scratch_pool));
+ SVN_ERR(svn_sqlite__set_schema_version(sdb, 17, scratch_pool));
+ ++start_format;
+
+ case 17:
+ SVN_ERR(bump_to_17(wcroot_abspath, sdb, scratch_pool));
++start_format;
#endif
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/util.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/util.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/util.c Tue Dec 15 06:14:36 2009
@@ -5,10 +5,10 @@
* specific to working copies.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-checks.sql
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-checks.sql?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-checks.sql (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-checks.sql Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* This is intended for use with SQLite 3
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-metadata.sql?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-metadata.sql Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* This is intended for use with SQLite 3
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -456,9 +456,27 @@
/* ------------------------------------------------------------------------- */
-/* Format 16 introduces new handling for conflict information. */
+/* Format 16 introduces some new columns for pristines and locks. */
-- format: 16
+/* An md5 column for the pristine table. */
+ALTER TABLE PRISTINE
+ADD COLUMN md5_checksum TEXT;
+
+/* Add the locked_levels column to record the depth of a lock. */
+ALTER TABLE WC_LOCK
+ADD COLUMN locked_levels INTEGER NOT NULL DEFAULT -1;;
+
+/* Default the depth of existing locks to 0. */
+UPDATE wc_lock
+SET locked_levels = 0;
+
+
+/* ------------------------------------------------------------------------- */
+
+/* Format 17 introduces new handling for conflict information. */
+-- format: 17
+
/* ------------------------------------------------------------------------- */
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-queries.sql?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc-queries.sql Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* This is intended for use with SQLite 3
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -281,11 +281,11 @@
WHERE wc_id = ?1 AND local_relpath = ?2;
-- STMT_INSERT_WC_LOCK
-INSERT INTO WC_LOCK (wc_id, local_dir_relpath)
-VALUES (?1, ?2);
+INSERT INTO WC_LOCK (wc_id, local_dir_relpath, locked_levels)
+VALUES (?1, ?2, ?3);
-- STMT_SELECT_WC_LOCK
-SELECT local_dir_relpath FROM WC_LOCK
+SELECT locked_levels FROM WC_LOCK
WHERE wc_id = ?1 AND local_dir_relpath = ?2;
-- STMT_DELETE_WC_LOCK
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* wc.h : shared stuff internal to the svn_wc library.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -108,7 +108,7 @@
* Please document any further format changes here.
*/
-#define SVN_WC__VERSION 15
+#define SVN_WC__VERSION 16
/* A version <= this doesn't have property caching in the entries file. */
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* wc_db.c : manipulating the administrative database
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -211,7 +211,8 @@
WC_METADATA_SQL_12,
WC_METADATA_SQL_13,
WC_METADATA_SQL_14,
- WC_METADATA_SQL_15
+ WC_METADATA_SQL_15,
+ WC_METADATA_SQL_16
};
WC_QUERIES_SQL_DECLARE_STATEMENTS(statements);
@@ -317,6 +318,7 @@
*(new_ptr++) = LIKE_ESCAPE_CHAR[0];
*new_ptr = *old_ptr;
}
+ *new_ptr = '\0';
return result;
}
@@ -1845,7 +1847,10 @@
### or maybe let caller deal with that, if there is a possibility
### of a node kind change (rather than eat an extra lookup here). */
- return insert_base_node(&ibb, pdh->wcroot->sdb, scratch_pool);
+ SVN_ERR(insert_base_node(&ibb, pdh->wcroot->sdb, scratch_pool));
+ flush_entries(pdh);
+
+ return SVN_NO_ERROR;
}
@@ -5575,6 +5580,7 @@
svn_error_t *
svn_wc__db_wclock_set(svn_wc__db_t *db,
const char *local_abspath,
+ int levels_to_lock,
apr_pool_t *scratch_pool)
{
svn_sqlite__stmt_t *stmt;
@@ -5582,6 +5588,7 @@
SVN_ERR(get_statement_for_path(&stmt, db, local_abspath,
STMT_INSERT_WC_LOCK, scratch_pool));
+ SVN_ERR(svn_sqlite__bind_int64(stmt, 3, levels_to_lock));
err = svn_sqlite__insert(NULL, stmt);
if (err)
return svn_error_createf(SVN_ERR_WC_LOCKED, err,
@@ -5593,23 +5600,56 @@
}
-svn_error_t *
-svn_wc__db_wclocked(svn_boolean_t *locked,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+static svn_error_t *
+is_wclocked(svn_boolean_t *locked,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_int64_t recurse_depth,
+ apr_pool_t *scratch_pool)
{
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
+ svn_error_t *err;
+
+ err = get_statement_for_path(&stmt, db, local_abspath,
+ STMT_SELECT_WC_LOCK, scratch_pool);
+ if (err && err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
+ {
+ svn_error_clear(err);
+ *locked = FALSE;
+ return SVN_NO_ERROR;
+ }
- SVN_ERR(get_statement_for_path(&stmt, db, local_abspath,
- STMT_SELECT_WC_LOCK, scratch_pool));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
+
+ if (have_row)
+ {
+ apr_int64_t locked_levels = svn_sqlite__column_int64(stmt, 0);
+
+ /* The directory in question is considered locked if we find a lock
+ with depth -1 or the depth of the lock is greater than or equal to
+ the depth we've recursed. */
+ *locked = (locked_levels == -1 || locked_levels >= recurse_depth);
+ return svn_error_return(svn_sqlite__reset(stmt));
+ }
+
SVN_ERR(svn_sqlite__reset(stmt));
- *locked = have_row;
+ return svn_error_return(is_wclocked(locked, db,
+ svn_dirent_dirname(local_abspath,
+ scratch_pool),
+ recurse_depth + 1, scratch_pool));
+}
- return SVN_NO_ERROR;
+
+svn_error_t *
+svn_wc__db_wclocked(svn_boolean_t *locked,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_return(is_wclocked(locked, db, local_abspath, 0,
+ scratch_pool));
}
@@ -5644,7 +5684,7 @@
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_dir_abspath));
- pdh = get_or_create_pdh(db, local_dir_abspath, FALSE, scratch_pool);
+ pdh = get_or_create_pdh(db, local_dir_abspath, TRUE, scratch_pool);
pdh->locked = TRUE;
return SVN_NO_ERROR;
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/wc_db.h Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -1817,6 +1817,7 @@
svn_error_t *
svn_wc__db_wclock_set(svn_wc__db_t *db,
const char *local_abspath,
+ int levels_to_lock,
apr_pool_t *scratch_pool);
svn_error_t *
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* workqueue.c : manipulating work queue items
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/branches/issue-3242-dev/subversion/libsvn_wc/workqueue.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* workqueue.h : manipulating work queue items
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_authz_svn/mod_authz_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_authz_svn/mod_authz_svn.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_authz_svn/mod_authz_svn.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* based authorization for a Subversion repository.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/activity.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/activity.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/activity.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/activity.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* activity.c: DeltaV activity handling
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/authz.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/authz.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/authz.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* authz.c: authorization related code
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/dav_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/dav_svn.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/dav_svn.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* dav_svn.h: types, functions, macros for the DAV/SVN Apache module
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/deadprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/deadprops.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/deadprops.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/deadprops.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* deadprops.c: mod_dav_svn dead property provider functions for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/liveprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/liveprops.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/liveprops.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* liveprops.c: mod_dav_svn live property provider functions for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/lock.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/lock.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/lock.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* lock.c: mod_dav_svn locking provider functions
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/merge.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/merge.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/merge.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* merge.c: handle the MERGE response processing
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mirror.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mirror.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mirror.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* mirror.c: Use a transparent proxy to mirror Subversion instances.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mod_dav_svn.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/mod_dav_svn.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* repository.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/dated-rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/dated-rev.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/dated-rev.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/dated-rev.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* version.c: mod_dav_svn versioning provider functions for Subversion
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/deleted-rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/deleted-rev.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/deleted-rev.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/deleted-rev.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* deleted-rev : routine for getting the revision a path was deleted.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/file-revs.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/file-revs.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/file-revs.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/file-revs.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
* file_revs.c: handle the file-revs-report request and response
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/get-location-segments.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/get-location-segments.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/get-location-segments.c (original)
+++ subversion/branches/issue-3242-dev/subversion/mod_dav_svn/reports/get-location-segments.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
* for Subversion's get-location-segments RA API.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at