Author: julianfoad
Date: Fri Dec 7 21:57:03 2012
New Revision: 1418501
URL: http://svn.apache.org/viewvc?rev=1418501&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(move_update): Add a doc string saying what this test is for, and comments
and blank lines to clarify the set-up stage.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
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=1418501&r1=1418500&r2=1418501&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Dec 7
21:57:03 2012
@@ -4284,6 +4284,8 @@ move_added(const svn_test_opts_t *opts,
return SVN_NO_ERROR;
}
+/* Test the result of 'update' when the incoming changes are inside a
+ * directory that is locally moved. */
static svn_error_t *
move_update(const svn_test_opts_t *opts, apr_pool_t *pool)
{
@@ -4291,6 +4293,7 @@ move_update(const svn_test_opts_t *opts,
SVN_ERR(svn_test__sandbox_create(&b, "move_update", opts, pool));
+ /* r1: Create files 'f', 'h' */
SVN_ERR(sbox_wc_mkdir(&b, "A"));
SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
sbox_file_write(&b, "A/B/f", "r1 content\n");
@@ -4298,12 +4301,18 @@ move_update(const svn_test_opts_t *opts,
SVN_ERR(sbox_wc_add(&b, "A/B/f"));
SVN_ERR(sbox_wc_add(&b, "A/B/h"));
SVN_ERR(sbox_wc_commit(&b, ""));
+
+ /* r2: Modify 'f' */
sbox_file_write(&b, "A/B/f", "r1 content\nr2 content\n");
SVN_ERR(sbox_wc_commit(&b, ""));
+
+ /* r3: Delete 'h', add 'g' */
sbox_file_write(&b, "A/B/g", "r3 content\n");
SVN_ERR(sbox_wc_add(&b, "A/B/g"));
SVN_ERR(sbox_wc_delete(&b, "A/B/h"));
SVN_ERR(sbox_wc_commit(&b, ""));
+
+ /* r4: Add a new subtree 'X' */
SVN_ERR(sbox_wc_mkdir(&b, "X"));
sbox_file_write(&b, "X/f", "r4 content\n");
sbox_file_write(&b, "X/g", "r4 content\n");
@@ -4312,6 +4321,7 @@ move_update(const svn_test_opts_t *opts,
SVN_ERR(sbox_wc_add(&b, "X/g"));
SVN_ERR(sbox_wc_add(&b, "X/h"));
SVN_ERR(sbox_wc_commit(&b, ""));
+
SVN_ERR(sbox_wc_update(&b, "", 1));
/* A is single-revision so A2 is a single-revision copy */
