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 2010/06/09 16:21:15 UTC
svn commit: r953022 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_client/add.c subversion/tests/cmdline/basic_tests.py
Author: hwright
Date: Wed Jun 9 14:21:15 2010
New Revision: 953022
URL: http://svn.apache.org/viewvc?rev=953022&view=rev
Log:
Merge r951753 from trunk:
* r951753
Fix issue #3649: a bogus 'mkdir --parents' error.
Justification:
Simple fix, user requests.
Votes:
+1: danielsh, rhuijben, stylesen
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_client/add.c
subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 9 14:21:15 2010
@@ -72,4 +72,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879954,879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,935992,935996,937610,944635
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879954,879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,935992,935996,937610,944635,951753
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 9 14:21:15 2010
@@ -71,4 +71,4 @@
/subversion/branches/tc_url_rev/CHANGES:874351-874483
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635
+/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635,951753
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=953022&r1=953021&r2=953022&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Jun 9 14:21:15 2010
@@ -277,13 +277,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r951753
- Fix issue #3649: a bogus 'mkdir --parents' error.
- Justification:
- Simple fix, user requests.
- Votes:
- +1: danielsh, rhuijben, stylesen
-
* r901304
Update email address to which to send the crash reports (on Windows).
Justification:
Modified: subversion/branches/1.6.x/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_client/add.c?rev=953022&r1=953021&r2=953022&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_client/add.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_client/add.c Wed Jun 9 14:21:15 2010
@@ -758,6 +758,11 @@ mkdir_urls(svn_commit_info_t **commit_in
qsort(targets->elts, targets->nelts, targets->elt_size,
svn_sort_compare_paths);
+ /* ### This reparent may be problematic in limited-authz-to-common-parent
+ ### scenarios (compare issue #3242). See also issue #3496. */
+ if (ra_session)
+ SVN_ERR(svn_ra_reparent(ra_session, common, pool));
+
/* Create new commit items and add them to the array. */
if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
{
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py?rev=953022&r1=953021&r2=953022&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/basic_tests.py Wed Jun 9 14:21:15 2010
@@ -243,20 +243,28 @@ def basic_mkdir_url_with_parents(sbox):
sbox.build()
+ X_url = sbox.repo_url + '/X'
X_Y_Z_url = sbox.repo_url + '/X/Y/Z'
X_Y_Z2_url = sbox.repo_url + '/X/Y/Z2'
X_T_C_url = sbox.repo_url + '/X/T/C'
+ U_url = sbox.repo_url + '/U'
U_V_url = sbox.repo_url + '/U/V'
+ U_V_W_url = sbox.repo_url + '/U/V/W'
svntest.actions.run_and_verify_svn("erroneous mkdir sans --parents",
[],
".*Try 'svn mkdir --parents' instead.*",
'mkdir', '-m', 'log_msg',
- X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_url)
+ X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
- svntest.actions.run_and_verify_svn("mkdir --parents",
+ svntest.actions.run_and_verify_svn("mkdir",
["\n", "Committed revision 2.\n"], [],
+ 'mkdir', '-m', 'log_msg',
+ X_url, U_url)
+
+ svntest.actions.run_and_verify_svn("mkdir --parents",
+ ["\n", "Committed revision 3.\n"], [],
'mkdir', '-m', 'log_msg', '--parents',
- X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_url)
+ X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
expected_output = wc.State(sbox.wc_dir, {
'X' : Item(status='A '),
@@ -267,6 +275,7 @@ def basic_mkdir_url_with_parents(sbox):
'X/T/C' : Item(status='A '),
'U' : Item(status='A '),
'U/V' : Item(status='A '),
+ 'U/V/W' : Item(status='A '),
})
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({
@@ -278,17 +287,19 @@ def basic_mkdir_url_with_parents(sbox):
'X/T/C' : Item(),
'U' : Item(),
'U/V' : Item(),
+ 'U/V/W' : Item(),
})
- expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 2)
+ expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 3)
expected_status.add({
- 'X' : Item(status=' ', wc_rev=2),
- 'X/Y' : Item(status=' ', wc_rev=2),
- 'X/Y/Z' : Item(status=' ', wc_rev=2),
- 'X/Y/Z2' : Item(status=' ', wc_rev=2),
- 'X/T' : Item(status=' ', wc_rev=2),
- 'X/T/C' : Item(status=' ', wc_rev=2),
- 'U' : Item(status=' ', wc_rev=2),
- 'U/V' : Item(status=' ', wc_rev=2),
+ 'X' : Item(status=' ', wc_rev=3),
+ 'X/Y' : Item(status=' ', wc_rev=3),
+ 'X/Y/Z' : Item(status=' ', wc_rev=3),
+ 'X/Y/Z2' : Item(status=' ', wc_rev=3),
+ 'X/T' : Item(status=' ', wc_rev=3),
+ 'X/T/C' : Item(status=' ', wc_rev=3),
+ 'U' : Item(status=' ', wc_rev=3),
+ 'U/V' : Item(status=' ', wc_rev=3),
+ 'U/V/W' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output,