You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/06/14 18:45:59 UTC
svn commit: r954551 - in /subversion/branches/1.6.x-issue3242-reintegrate:
./ CHANGES subversion/tests/cmdline/merge_authz_tests.py
Author: pburba
Date: Mon Jun 14 16:45:59 2010
New Revision: 954551
URL: http://svn.apache.org/viewvc?rev=954551&view=rev
Log:
On the 1.6.x-issue3242-reintegrate branch: Merge r945350 from trunk.
Modified:
subversion/branches/1.6.x-issue3242-reintegrate/ (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/CHANGES (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 16:45:59 2010
@@ -73,4 +73,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,879902,879916,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,898048,898963,899826,899828,900797,901304,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,953317
+/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,879902,879916,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,898048,898963,899826,899828,900797,901304,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,945350,951753,953317
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 16:45:59 2010
@@ -72,4 +72,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,951753,953317
+/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635,945350,951753,953317
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py?rev=954551&r1=954550&r2=954551&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py Mon Jun 14 16:45:59 2010
@@ -408,6 +408,146 @@ def mergeinfo_and_skipped_paths(sbox):
None, None, None, None,
None, 1, 0)
+def reintegrate_fails_if_no_root_access(sbox):
+ "reintegrate fails if no root access"
+
+ # If a user is authorized to a reintegrate source and target, they
+ # should be able to reintegrate, regardless of what authorization
+ # they have to parents of the source and target.
+ #
+ # See http://subversion.tigris.org/issues/show_bug.cgi?id=3242#desc78
+
+ # Some paths we'll care about
+ wc_dir = sbox.wc_dir
+ A_path = os.path.join(wc_dir, 'A')
+ A_COPY_path = os.path.join(wc_dir, 'A_COPY')
+ beta_COPY_path = os.path.join(wc_dir, 'A_COPY', 'B', 'E', 'beta')
+ rho_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'G', 'rho')
+ omega_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'H', 'omega')
+ psi_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'H', 'psi')
+
+ # Copy A@1 to A_COPY in r2, and then make some changes to A in r3-6.
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ expected_disk, expected_status = set_up_branch(sbox)
+
+ # Make a change on the branch, to A_COPY/mu, commit in r7.
+ svntest.main.file_write(os.path.join(wc_dir, "A_COPY", "mu"),
+ "Changed on the branch.")
+ expected_output = wc.State(wc_dir, {'A_COPY/mu' : Item(verb='Sending')})
+ expected_status.tweak('A_COPY/mu', wc_rev=7)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status, None, wc_dir)
+ expected_disk.tweak('A_COPY/mu', contents='Changed on the branch.')
+
+ # Update the WC.
+ svntest.main.run_svn(None, 'up', wc_dir)
+
+
+ # Sync A_COPY with A.
+ expected_output = expected_merge_output([[2,7]],
+ ['U ' + beta_COPY_path + '\n',
+ 'U ' + rho_COPY_path + '\n',
+ 'U ' + omega_COPY_path + '\n',
+ 'U ' + psi_COPY_path + '\n',
+ # Mergeinfo notification
+ ' U ' + A_COPY_path + '\n'])
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
+ sbox.repo_url + '/A', A_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'synch A_COPY with A', wc_dir)
+
+ # Change authz file so everybody has access to everything but the root.
+ if is_ra_type_svn() or is_ra_type_dav():
+ write_authz_file(sbox, {"/" : "* =",
+ "/A" : "* = rw",
+ "/A_COPY" : "* = rw",
+ "/iota" : "* = rw"})
+
+ # Now reintegrate A_COPY back to A. The lack of access to the root of the
+ # repository shouldn't be a problem. Right now it fails with this error:
+ #
+ # >svn merge ^/A_COPY A --reintegrate
+ # ..\..\..\subversion\svn\merge-cmd.c:358: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_client\merge.c:9758: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_client\merge.c:9728: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_client\merge.c:9573: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra\ra_loader.c:488: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra\ra_loader.c:488: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra\ra_loader.c:488: (apr_err=175009)
+ # svn: Unable to connect to a repository at URL 'http://localhost/
+ # svn-test-work/repositories/merge_authz_tests-3'
+ # ..\..\..\subversion\libsvn_ra_serf\options.c:490: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra_serf\util.c:595: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra_serf\util.c:1436: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra_serf\util.c:1127: (apr_err=175009)
+ # ..\..\..\subversion\libsvn_ra_serf\util.c:1127: (apr_err=175009)
+ # svn: XML parsing failed: (403 Forbidden)
+ #
+ # This test is set as XFail until this is fixed.
+ svntest.main.run_svn(None, 'up', wc_dir)
+ expected_output = wc.State(A_path, {
+ 'mu' : Item(status='U '),
+ })
+ expected_mergeinfo_output = wc.State(A_path, {
+ '' : Item(status=' G'),
+ })
+ expected_elision_output = wc.State(A_path, {
+ })
+ expected_disk = wc.State('', {
+ '' : Item(props={SVN_PROP_MERGEINFO : '/A_COPY:2-8'}),
+ 'B' : Item(),
+ 'B/lambda' : Item("This is the file 'lambda'.\n"),
+ 'B/E' : Item(),
+ 'B/E/alpha' : Item("This is the file 'alpha'.\n"),
+ 'B/E/beta' : Item("New content"),
+ 'B/F' : Item(),
+ 'mu' : Item("Changed on the branch."),
+ 'C' : Item(),
+ 'D' : Item(),
+ 'D/gamma' : Item("This is the file 'gamma'.\n"),
+ 'D/G' : Item(),
+ 'D/G/pi' : Item("This is the file 'pi'.\n"),
+ 'D/G/rho' : Item("New content"),
+ 'D/G/tau' : Item("This is the file 'tau'.\n"),
+ 'D/H' : Item(),
+ 'D/H/chi' : Item("This is the file 'chi'.\n"),
+ 'D/H/omega' : Item("New content"),
+ 'D/H/psi' : Item("New content"),
+ })
+ expected_status = wc.State(A_path, {
+ "B" : Item(status=' ', wc_rev=8),
+ "B/lambda" : Item(status=' ', wc_rev=8),
+ "B/E" : Item(status=' ', wc_rev=8),
+ "B/E/alpha" : Item(status=' ', wc_rev=8),
+ "B/E/beta" : Item(status=' ', wc_rev=8),
+ "B/F" : Item(status=' ', wc_rev=8),
+ "mu" : Item(status='M ', wc_rev=8),
+ "C" : Item(status=' ', wc_rev=8),
+ "D" : Item(status=' ', wc_rev=8),
+ "D/gamma" : Item(status=' ', wc_rev=8),
+ "D/G" : Item(status=' ', wc_rev=8),
+ "D/G/pi" : Item(status=' ', wc_rev=8),
+ "D/G/rho" : Item(status=' ', wc_rev=8),
+ "D/G/tau" : Item(status=' ', wc_rev=8),
+ "D/H" : Item(status=' ', wc_rev=8),
+ "D/H/chi" : Item(status=' ', wc_rev=8),
+ "D/H/omega" : Item(status=' ', wc_rev=8),
+ "D/H/psi" : Item(status=' ', wc_rev=8),
+ "" : Item(status=' M', wc_rev=8),
+ })
+ expected_skip = wc.State(A_path, {})
+ svntest.actions.run_and_verify_merge(A_path, None, None,
+ sbox.repo_url + '/A_COPY', None,
+ expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, None, None, None,
+ None, True, True,
+ '--reintegrate')
+
########################################################################
# Run the tests
@@ -417,6 +557,9 @@ test_list = [ None,
SkipUnless(Skip(mergeinfo_and_skipped_paths,
svntest.main.is_ra_type_file),
svntest.main.server_has_mergeinfo),
+ XFail(SkipUnless(Skip(reintegrate_fails_if_no_root_access,
+ svntest.main.is_ra_type_file),
+ svntest.main.server_has_mergeinfo)),
]
if __name__ == '__main__':