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 2011/04/20 22:58:55 UTC
svn commit: r1095511 - in /subversion/branches/1.6.x-issue3650: ./
subversion/tests/cmdline/log_tests.py
Author: pburba
Date: Wed Apr 20 20:58:54 2011
New Revision: 1095511
URL: http://svn.apache.org/viewvc?rev=1095511&view=rev
Log:
On the 1.6.x-issue3650 branch: Merge r1076730 from trunk.
* src-branch-1.6.x-WCNG
Mergeinfo changes only.
* subversion/tests/cmdline/log_tests.py
(merge_sensitive_log_ignores_cyclic_merges): Remove trunk-only XFail,
skip, and issue decorators and add their equivalents...
(test_list): ...here.
Modified:
subversion/branches/1.6.x-issue3650/ (props changed)
subversion/branches/1.6.x-issue3650/subversion/tests/cmdline/log_tests.py
Propchange: subversion/branches/1.6.x-issue3650/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 20:58:54 2011
@@ -104,4 +104,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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,879966,879971,880082,880095,880105,880146,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,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,102810
8,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058269,1058722,1064839,1068988,1070912,1071239,1071307,1072953,1076759
+/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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,879966,879971,880082,880095,880105,880146,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,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,102810
8,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058269,1058722,1064839,1068988,1070912,1071239,1071307,1072953,1076730,1076759
Modified: subversion/branches/1.6.x-issue3650/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3650/subversion/tests/cmdline/log_tests.py?rev=1095511&r1=1095510&r2=1095511&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3650/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/branches/1.6.x-issue3650/subversion/tests/cmdline/log_tests.py Wed Apr 20 20:58:54 2011
@@ -1692,6 +1692,108 @@ def log_of_local_copy(sbox):
"differs from that on move source '%s'"
% (psi_moved_path, psi_path))
+#----------------------------------------------------------------------
+
+def merge_sensitive_log_ignores_cyclic_merges(sbox):
+ "log -g should ignore cyclic merges"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ wc_disk, wc_status = set_up_branch(sbox)
+
+ A_path = os.path.join(wc_dir, 'A')
+ X_path = os.path.join(wc_dir, 'A', 'C', 'X')
+ kappa_path = os.path.join(wc_dir, 'A', 'C', 'X', 'kappa')
+ chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
+ A_COPY_path = os.path.join(wc_dir, 'A_COPY')
+ mu_COPY_path = os.path.join(wc_dir, 'A_COPY', 'mu')
+ tau_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'G', 'tau')
+ Z_COPY_path = os.path.join(wc_dir, 'A_COPY', 'C', 'Z')
+ nu_COPY_path = os.path.join(wc_dir, 'A_COPY', 'C', 'Z', 'nu')
+
+ # Make an edit on the "branch" to A_COPY/mu, commit as r7.
+ svntest.main.file_write(mu_COPY_path, "Branch edit.\n")
+ svntest.main.run_svn(None, 'ci', '-m', 'Branch edit', wc_dir)
+
+ # Make an edit on both the "trunk" and the "branch", commit as r8.
+ svntest.main.file_write(chi_path, "Trunk edit.\n")
+ svntest.main.file_write(tau_COPY_path, "Branch edit.\n")
+ svntest.main.run_svn(None, 'ci', '-m', 'Branch and trunk edits in one rev',
+ wc_dir)
+
+ # Sync merge A to A_COPY, commit as r9
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', A_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Sync merge A to A_COPY', wc_dir)
+
+ # Reintegrate A_COPY to A, commit as r10
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'merge', '--reintegrate',
+ sbox.repo_url + '/A_COPY', A_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Reintegrate A_COPY to A', wc_dir)
+
+ # Do a --record-only merge of r10 from A to A_COPY, commit as r11.
+ # This will allow us to continue using the branch without deleting it.
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', A_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m',
+ '--record-only merge r10 from A to A_COPY', wc_dir)
+
+ # Make an edit on the "branch"; add A_COPY/C and A_COPY/C/Z/nu,
+ # commit as r12.
+ svntest.main.run_svn(None, 'mkdir', Z_COPY_path)
+ svntest.main.file_write(nu_COPY_path, "A new branch file.\n")
+ svntest.main.run_svn(None, 'add', nu_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Branch edit: Add a subtree', wc_dir)
+
+ # Make an edit on the "trunk"; add A/C/X and A/C/X/kappa,
+ # commit as r13.
+ svntest.main.run_svn(None, 'mkdir', X_path)
+ svntest.main.file_write(kappa_path, "A new trunk file.\n")
+ svntest.main.run_svn(None, 'add', kappa_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Trunk edit: Add a subtree', wc_dir)
+ svntest.main.run_svn(None, 'up', wc_dir)
+
+ # Sync merge A to A_COPY, commit as r14
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', A_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Sync merge A to A_COPY', wc_dir)
+
+ # Reintegrate A_COPY to A, commit as r15
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'merge', '--reintegrate',
+ sbox.repo_url + '/A_COPY', A_path)
+ svntest.main.run_svn(None, 'ci', '-m', '2nd reintegrate of A_COPY to A',
+ wc_dir)
+
+ # Run 'svn log -g A'. This currently fails because r13, r10, r6, r5, r4,
+ # and r3 are all reported normally (i.e. as part of A's own history), but
+ # they are *also* reported several times as merged via the the
+ # [sync|reintegrate|record-only] merges between A and A_COPY.
+ expected_merges = {
+ 15 : [],
+ 14 : [15],
+ 13 : [],
+ 12 : [15],
+ 11 : [15],
+ 10 : [],
+ 9 : [15,11],
+ 8 : [15,11,9],
+ 7 : [15,11],
+ 6 : [],
+ 5 : [],
+ 4 : [],
+ 3 : [],
+ 2 : [15,11],
+ 1 : [],
+ }
+ svntest.main.run_svn(None, 'up', wc_dir)
+ exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+ 'log', '-g',
+ A_path)
+ log_chain = parse_log_output(out)
+ check_merge_results(log_chain, expected_merges)
+
########################################################################
# Run the tests
@@ -1733,6 +1835,8 @@ test_list = [ None,
SkipUnless(merge_sensitive_log_propmod_merge_inheriting_path,
server_has_mergeinfo),
log_of_local_copy,
+ XFail(SkipUnless(merge_sensitive_log_ignores_cyclic_merges,
+ server_has_mergeinfo)),
]
if __name__ == '__main__':