You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/19 17:14:46 UTC
svn commit: r1186261 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_wc/adm_crawler.c subversion/tests/cmdline/depth_tests.py
Author: hwright
Date: Wed Oct 19 15:13:47 2011
New Revision: 1186261
URL: http://svn.apache.org/viewvc?rev=1186261&view=rev
Log:
Merge r1185911, r1185918 from trunk:
* r1185911, r1185918
Fix reporting of depth empty directories
Justification:
Without this patch 'svn update' sometimes tries to apply updates to nodes
that don't exist locally.
(1.6 received the same nodes but filtered the incoming data before
applying it to the working copy)
Notes:
r1185911 adds a simple test for this case and r1185918 resolves this
regression.
Votes:
+1: rhuijben, stsp, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c
subversion/branches/1.7.x/subversion/tests/cmdline/depth_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:13:47 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1181155,1181609,1181666,
1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185911,1185918
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186261&r1=1186260&r2=1186261&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 15:13:47 2011
@@ -85,16 +85,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1185911, r1185918
- Fix reporting of depth empty directories
- Justification:
- Without this patch 'svn update' sometimes tries to apply updates to nodes
- that don't exist locally.
- (1.6 received the same nodes but filtered the incoming data before
- applying it to the working copy)
- Notes:
- r1185911 adds a simple test for this case and r1185918 resolves this
- regression.
- Votes:
- +1: rhuijben, stsp, philip
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c?rev=1186261&r1=1186260&r2=1186261&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/adm_crawler.c Wed Oct 19 15:13:47 2011
@@ -562,7 +562,7 @@ report_revisions_and_depths(svn_wc__db_t
|| (dir_depth == svn_depth_immediates
&& ths->depth != svn_depth_empty)
|| (ths->depth < svn_depth_infinity
- && depth == svn_depth_infinity))
+ && SVN_DEPTH_IS_RECURSIVE(depth)))
{
/* ... or perhaps just a differing revision, lock token,
incomplete subdir, the mere presence of the directory
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=1186261&r1=1186260&r2=1186261&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 Oct 19 15:13:47 2011
@@ -2811,6 +2811,35 @@ def sparse_update_with_dash_dash_parents
None, None, None, None, None, False,
'--parents', omega_path)
+def update_below_depth_empty(sbox):
+ "update below depth empty shouldn't be applied"
+ sbox.build()
+
+ repo_url = sbox.repo_url
+ A = sbox.ospath('A')
+
+ expected_output = svntest.wc.State(sbox.wc_dir, {
+ 'A/C' : Item(status='D '),
+ 'A/B' : Item(status='D '),
+ 'A/mu' : Item(status='D '),
+ 'A/D' : Item(status='D '),
+ })
+ svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
+ None, None, None, None, None, None,
+ False,
+ '--set-depth', 'empty', A)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', repo_url + '/iota',
+ repo_url + '/A/B',
+ '-m', 'remote copy')
+
+ expected_output = svntest.wc.State(sbox.wc_dir, {
+ })
+
+ # This update should just update the revision of the working copy
+ svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
+ None, None)
#----------------------------------------------------------------------
# list all tests here, starting with None:
@@ -2858,6 +2887,7 @@ test_list = [ None,
update_excluded_path_sticky_depths,
update_depth_empty_root_of_infinite_children,
sparse_update_with_dash_dash_parents,
+ update_below_depth_empty,
]
if __name__ == "__main__":