You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/10/21 14:06:11 UTC
svn commit: r1187311 - in /subversion/trunk/subversion:
libsvn_wc/update_editor.c libsvn_wc/workqueue.c
tests/libsvn_wc/op-depth-test.c
Author: philip
Date: Fri Oct 21 12:06:11 2011
New Revision: 1187311
URL: http://svn.apache.org/viewvc?rev=1187311&view=rev
Log:
Fix issue 4040, spurious NODES rows after interrupt.
* subversion/libsvn_wc/update_editor.c
(modcheck_callback): Handle incomplete like normal.
* subversion/libsvn_wc/workqueue.c
(remove_base_node): Descend into children of incomplete directories.
* subversion/tests/libsvn_wc/op-depth-test.c
(incomplete_switch): New test.
(test_funcs): Add new test.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1187311&r1=1187310&r2=1187311&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Oct 21 12:06:11 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:
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1187311&r1=1187310&r2=1187311&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Oct 21 12:06:11 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/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1187311&r1=1187310&r2=1187311&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Oct 21 12:06:11 2011
@@ -3670,6 +3670,56 @@ copy_wc_wc_absent(const svn_test_opts_t
return SVN_NO_ERROR;
}
+/* Issue 4040 */
+static svn_error_t *
+incomplete_switch(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "incomplete_switch", opts, pool));
+
+ SVN_ERR(wc_mkdir(&b, "A"));
+ SVN_ERR(wc_mkdir(&b, "A/B"));
+ SVN_ERR(wc_mkdir(&b, "A/B/C"));
+ SVN_ERR(wc_mkdir(&b, "A/B/C/D"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_copy(&b, "A", "X"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_copy(&b, "A", "X/A"));
+ SVN_ERR(wc_commit(&b, ""));
+ SVN_ERR(wc_delete(&b, "X/A"));
+ SVN_ERR(wc_commit(&b, ""));
+
+ {
+ /* Interrupted switch from A@1 to X@3 */
+ nodes_row_t before[] = {
+ {0, "", "incomplete", 3, "X"},
+ {0, "A", "incomplete", 3, "X/A"},
+ {0, "A/B", "incomplete", 3, "X/A/B"},
+ {0, "A/B/C", "incomplete", 3, "X/A/B/C"},
+ {0, "B", "normal", 1, "A/B"},
+ {0, "B/C", "normal", 1, "A/B/C"},
+ {0, "B/C/D", "normal", 1, "A/B/C/D"},
+ {0}
+ };
+
+ nodes_row_t after_update[] = {
+ {0, "", "normal", 4, "X"},
+ {0, "B", "normal", 4, "A/B"},
+ {0, "B/C", "normal", 4, "A/B/C"},
+ {0, "B/C/D", "normal", 4, "A/B/C/D"},
+ {0}
+ };
+
+ SVN_ERR(insert_dirs(&b, before));
+ SVN_ERR(check_db_rows(&b, "", before));
+ SVN_ERR(wc_update(&b, "", 4));
+ SVN_ERR(check_db_rows(&b, "", after_update));
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* ---------------------------------------------------------------------- */
/* The list of test functions */
@@ -3736,5 +3786,7 @@ struct svn_test_descriptor_t test_funcs[
"copy_file_externals"),
SVN_TEST_OPTS_PASS(copy_wc_wc_absent,
"test_wc_wc_copy_absent"),
+ SVN_TEST_OPTS_PASS(incomplete_switch,
+ "incomplete_switch (issue 4040)"),
SVN_TEST_NULL
};