On the sqlite-deep-copies branch: Merge r28284 from trunk.
A follow-up to r28280, fixing handling and tests for the new "P"
(sParse checkout) output from the 'svnversion' command.
* subversion/libsvn_wc/revision_status.c
(analyze_status): Correct setting of BATON->result->sparse_checkout.
* subversion/tests/cmdline/svnversion_tests.py
(svnversion_test): Include "S" in test for "sParse checkout", since
the way the directory is constructed makes it appear as "Switched".
Found by: glasser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/sqlite-deep-copies@868359 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_wc/revision_status.c b/subversion/libsvn_wc/revision_status.c
index 0e898f6..d0f8ca7 100644
--- a/subversion/libsvn_wc/revision_status.c
+++ b/subversion/libsvn_wc/revision_status.c
@@ -63,7 +63,7 @@
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);
+ sb->result->sparse_checkout |= (status->entry->depth != svn_depth_infinity);
if (sb->wc_path
&& (! sb->wc_url)
diff --git a/subversion/tests/cmdline/svnversion_tests.py b/subversion/tests/cmdline/svnversion_tests.py
index d11f166..411e56f 100755
--- a/subversion/tests/cmdline/svnversion_tests.py
+++ b/subversion/tests/cmdline/svnversion_tests.py
@@ -137,7 +137,7 @@
# Partial (sparse) checkout
svntest.actions.run_and_verify_svnversion("Sparse checkout", A_A_path,
- repo_url, [ "2S\n" ], [])
+ repo_url, [ "2SP\n" ], [])
#----------------------------------------------------------------------
