Author: neels
Date: Fri Nov 2 22:26:16 2012
New Revision: 1405190
URL: http://svn.apache.org/viewvc?rev=1405190&view=rev
Log:
Cosmetic.
* subversion/libsvn_client/commit.c
(append_externals_as_explicit_targets): Fix indent.
* subversion/tests/cmdline/externals_tests.py
(include_immediate_dir_externals): Mark with #4252, fix comment.
Modified:
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/tests/cmdline/externals_tests.py
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1405190&r1=1405189&r2=1405190&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Nov 2 22:26:16 2012
@@ -1428,14 +1428,14 @@ append_externals_as_explicit_targets(apr
/* Easy part of applying DEPTH to externals. */
if (depth == svn_depth_empty)
- {
- /* Don't recurse. */
- return SVN_NO_ERROR;
- }
- else if (depth != svn_depth_infinity)
- {
- include_dir_externals = FALSE;
- /* We slip in dir externals as explicit targets. When we do that,
+ {
+ /* Don't recurse. */
+ return SVN_NO_ERROR;
+ }
+ else if (depth != svn_depth_infinity)
+ {
+ include_dir_externals = FALSE;
+ /* We slip in dir externals as explicit targets. When we do that,
* depth_immediates should become depth_empty for dir externals targets.
* But adding the dir external to the list of targets makes it get
* handled with depth_immediates itself, and thus will also include the
@@ -1450,7 +1450,7 @@ append_externals_as_explicit_targets(apr
* ### --depth=immediates --include-externals', commit dir externals
* ### (only immediate children of a target) with depth_empty instead of
* ### not at all. No other effect. So not doing that for now. */
- }
+ }
/* Iterate *and* grow REL_TARGETS at the same time. */
rel_targets_nelts_fixed = rel_targets->nelts;
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1405190&r1=1405189&r2=1405190&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Fri Nov 2
22:26:16 2012
@@ -2554,10 +2554,12 @@ def include_externals(sbox):
actions.run_and_verify_unquiet_status(wc_dir, expected_status)
+@Issue(4252)
@XFail()
def include_immediate_dir_externals(sbox):
"commit --include-externals --depth=immediates"
- # See also comment inside svn_client_commit6().
+ # See also comment in append_externals_as_explicit_targets() in
+ # libsvn_client/commit.c, from r1198765.
# svntest.factory.make(sbox,"""
# svn mkdir X
