Author: svn-role
Date: Wed Aug 1 04:02:58 2012
New Revision: 1367851
URL: http://svn.apache.org/viewvc?rev=1367851&view=rev
Log:
Reintegrate the 1.7.x-r1365554 branch:
* r1365549, r1365554, r1365556
Resolve regression where 'svn revert --depth files' only operates on the
directory
Justification:
Simple regression fix.
Branch: ^/subversion/branches/1.7.x-r1365554
Notes:
Trivial patch in r1365554; the other patches are for adding and updating
a regression test.
Votes:
+1: rhuijben, philip, steveking
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c
subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1365549,1365554,1365556
Merged /subversion/branches/1.7.x-r1365554:r1365558-1367850
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1367851&r1=1367850&r2=1367851&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 1 04:02:58 2012
@@ -81,18 +81,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1365549, r1365554, r1365556
- Resolve regression where 'svn revert --depth files' only operates on the
- directory
- Justification:
- Simple regression fix.
- Branch: ^/subversion/branches/1.7.x-r1365554
- Notes:
- Trivial patch in r1365554; the other patches are for adding and updating
- a regression test.
- Votes:
- +1: rhuijben, philip, steveking
-
* r1354876, r1354907, r1355340
Allow non-existing but valid canonical absolute paths to pass through
svn_dirent_get_absolute().
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c?rev=1367851&r1=1367850&r2=1367851&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c Wed Aug 1
04:02:58 2012
@@ -1935,7 +1935,7 @@ new_revert_partial(svn_wc__db_t *db,
{
svn_wc__db_kind_t kind;
- SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE,
+ SVN_ERR(svn_wc__db_read_kind(&kind, db, child_abspath, TRUE,
iterpool));
if (kind != svn_wc__db_kind_file)
continue;
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py?rev=1367851&r1=1367850&r2=1367851&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py Wed Aug
1 04:02:58 2012
@@ -2881,7 +2881,29 @@ def commit_then_immediates_update(sbox):
expected_status,
None, None, None, None, None, False,
"--depth=immediates", wc_dir)
+
+def revert_depth_files(sbox):
+ "depth immediate+files should revert deleted files"
+
+ sbox.build(read_only = True)
+
+ expected_output = "Reverted '" + re.escape(sbox.ospath('A/mu')) + "'"
+ # Apply an unrelated delete one level to deep
+ sbox.simple_rm('A/D/gamma')
+
+ sbox.simple_rm('A/mu')
+ # Expect reversion of just 'mu'
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'revert', '--depth=immediates',
sbox.ospath('A'))
+
+ # Apply an unrelated directory delete
+ sbox.simple_rm('A/D')
+
+ sbox.simple_rm('A/mu')
+ # Expect reversion of just 'mu'
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'revert', '--depth=files',
sbox.ospath('A'))
#----------------------------------------------------------------------
@@ -2932,6 +2954,7 @@ test_list = [ None,
sparse_update_with_dash_dash_parents,
update_below_depth_empty,
commit_then_immediates_update,
+ revert_depth_files,
]
if __name__ == "__main__":
