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/12 00:57:26 UTC
svn commit: r953897 -
/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri Jun 11 22:57:26 2010
New Revision: 953897
URL: http://svn.apache.org/viewvc?rev=953897&view=rev
Log:
On the 1.6.x-issue3654 branch: Merge r953878 from
^/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
to subversion\tests\cmdline\merge_tests.py.
Why a subtree file merge? Becasue recently we refactored merge_tests.py on
trunk into three different files, and the new test we want to backport is
in merge_reintegrate_tests.py.
Modified:
subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py (contents, props changed)
Modified: subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py?rev=953897&r1=953896&r2=953897&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py Fri Jun 11 22:57:26 2010
@@ -16397,6 +16397,204 @@ def reintegrate_with_self_referential_me
None, None, None, None,
None, 1, 0, '--reintegrate')
+#----------------------------------------------------------------------
+# Test for issue #3654 'added subtrees with mergeinfo break reintegrate'.
+def added_subtrees_with_mergeinfo_break_reintegrate(sbox):
+ "added subtrees with mergeinfo break reintegrate"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Some paths we'll care about
+ A_path = os.path.join(wc_dir, "A")
+ nu_path = os.path.join(wc_dir, "A", "C", "nu")
+ mu_path = os.path.join(wc_dir, "A", "mu")
+ A_COPY_path = os.path.join(wc_dir, "A_COPY")
+ lambda_COPY_path = os.path.join(wc_dir, "A_COPY", "B", "lambda")
+ A_COPY_2_path = os.path.join(wc_dir, "A_COPY_2")
+ nu_COPY_2_path = os.path.join(wc_dir, "A_COPY_2", "C", "nu")
+
+ # Branch A@1 to A_COPY and A_COPY_2 in r2 and r3 respectively.
+ # Make some changes under 'A' in r4-7.
+ wc_disk, wc_status = set_up_branch(sbox, nbr_of_branches=2)
+
+ # r8 - Add a new file A_COPY_2/C/nu.
+ svntest.main.file_write(nu_COPY_2_path, "This is the file 'nu'.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_COPY_2_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Add new file in A_COPY_2 branch',
+ wc_dir)
+
+
+ # r9 - Cyclic cherry pick merge r8 from A_COPY_2 back to A.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'merge', '-c', '8',
+ sbox.repo_url + '/A_COPY_2',
+ A_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Merge r8 from A_COPY_2 to A.',
+ wc_dir)
+
+ # r10 - Make an edit to A_COPY_2/C/nu.
+ svntest.main.file_write(nu_COPY_2_path, "A_COPY_2 edit to file 'nu'.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Edit new file on A_COPY_2 branch',
+ wc_dir)
+
+ # r11 - Cyclic subtree cherry pick merge r10 from A_COPY_2/C/nu
+ # back to A/C/nu.
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'merge', '-c', '10',
+ sbox.repo_url + '/A_COPY_2/C/nu',
+ nu_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Merge r8 from A_COPY_2/C/nu to A/C/nu.',
+ wc_dir)
+
+ # r12 - Edit under A_COPY.
+ svntest.main.file_write(mu_path, "mu edits on A_COPY.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ '-m', 'Work on A_COPY branch.',
+ wc_dir)
+
+ # r13 - Sync merge A to A_COPY in preparation for reintegrate.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'merge', sbox.repo_url + '/A', A_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Prep for reintegrate: Sync A to A_COPY.',
+ wc_dir)
+
+ # r14 - Reintegrate A_COPY to A.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'merge', '--reintegrate',
+ sbox.repo_url + '/A_COPY', A_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Reintegrate A_COPY to A.',
+ wc_dir)
+
+ # r15 - Delete A_COPY.
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'delete', A_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Delete A_COPY branch', wc_dir)
+
+ # r16 - Create new A_COPY from A@HEAD=15.
+ #
+ # Update so we copy HEAD:
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'copy', A_path, A_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Create new A_COPY branch from A', wc_dir)
+
+ # r17 - Unrelated edits under both A and A_COPY.
+ svntest.main.file_write(nu_path, "Trunk work on nu.\n")
+ svntest.main.file_write(lambda_COPY_path, "lambda edit on A_COPY.\n")
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Unrelated edits on A and A_COPY branch.',
+ wc_dir)
+
+ # r18 - Sync A to A_COPY in preparation for another reintegrate.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'merge', sbox.repo_url + '/A', A_COPY_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ 'Prep for reintegrate: Sync A to A_COPY.',
+ wc_dir)
+
+ # Reintegrate A_COPY back to A. We just synced A_COPY with A, so this
+ # should work. The only text change should be the change made to
+ # A_COPY/B/lambda in r17 after the new A_COPY was created.
+ #
+ # Currently this fails with:
+ #
+ # >svn merge ^^/A_COPY A --reintegrate
+ # svn: Reintegrate can only be used if revisions 2 through 13 were
+ # previously merged from file:///D:/SVN/src-trunk/Release/subversion/
+ # tests/cmdline/svn-test-work/repositories/merge_reintegrate_tests-13/A
+ # to the reintegrate source, but this is not the case:
+ # A_COPY/C/nu
+ # Missing ranges: /A/C/nu:9,11
+ #
+ # Marking this test as XFail until this issue is fixed.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ expected_output = wc.State(A_path, {
+ '' : Item(status=' U'),
+ 'B/lambda' : Item(status='U '),
+ 'C/nu' : Item(status=' U'),
+ })
+ expected_status = wc.State(A_path, {
+ '' : Item(status=' M'),
+ 'B' : Item(status=' '),
+ 'mu' : Item(status=' '),
+ 'B/E' : Item(status=' '),
+ 'B/E/alpha' : Item(status=' '),
+ 'B/E/beta' : Item(status=' '),
+ 'B/lambda' : Item(status='M '),
+ 'B/F' : Item(status=' '),
+ 'C' : Item(status=' '),
+ 'C/nu' : Item(status=' M'),
+ 'D' : Item(status=' '),
+ 'D/G' : Item(status=' '),
+ 'D/G/pi' : Item(status=' '),
+ 'D/G/rho' : Item(status=' '),
+ 'D/G/tau' : Item(status=' '),
+ 'D/gamma' : Item(status=' '),
+ 'D/H' : Item(status=' '),
+ 'D/H/chi' : Item(status=' '),
+ 'D/H/psi' : Item(status=' '),
+ 'D/H/omega' : Item(status=' '),
+ })
+ expected_status.tweak(wc_rev=18)
+ expected_disk = wc.State('', {
+ '' : Item(props={SVN_PROP_MERGEINFO :
+ '/A_COPY:2-13,16-18\n'
+ # ^ ^
+ # | |
+ # from _| |
+ # 1st |
+ # reintegrate |
+ # |
+ # from this reintegrate
+ #
+ '/A_COPY_2:8'}), # <-- From cyclic merge in r9
+ 'B' : Item(),
+ 'mu' : Item("mu edits on A_COPY.\n"), # From earlier reintegrate.
+ 'B/E' : Item(),
+ 'B/E/alpha' : Item("This is the file 'alpha'.\n"),
+ 'B/E/beta' : Item("New content"),
+ 'B/lambda' : Item("lambda edit on A_COPY.\n"), # From this reintegrate.
+ 'B/F' : Item(),
+ 'C' : Item(),
+ 'C/nu' : Item("Trunk work on nu.\n",
+ props={SVN_PROP_MERGEINFO :
+ '/A_COPY/C/nu:2-13,16-18\n'
+ '/A_COPY_2/C/nu:10'}), # <-- From cyclic
+ # merge in r11
+ 'D' : Item(),
+ '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/gamma' : Item("This is the file 'gamma'.\n"),
+ 'D/H' : Item(),
+ 'D/H/chi' : Item("This is the file 'chi'.\n"),
+ 'D/H/psi' : Item("New content"),
+ 'D/H/omega' : Item("New content"),
+ })
+ expected_skip = wc.State(A_COPY_path, {})
+ svntest.actions.run_and_verify_merge(A_path, None, None,
+ sbox.repo_url + '/A_COPY',
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, None, None, None,
+ None, 1, 1, "--reintegrate")
+
########################################################################
# Run the tests
@@ -16620,6 +16818,7 @@ test_list = [ None,
SkipUnless(handle_gaps_in_implicit_mergeinfo,
server_has_mergeinfo),
reintegrate_with_self_referential_mergeinfo,
+ XFail(added_subtrees_with_mergeinfo_break_reintegrate),
]
if __name__ == '__main__':
Propchange: subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 11 22:57:26 2010
@@ -0,0 +1,77 @@
+/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/merge_tests.py:870312
+/subversion/branches/1.6.x-1.6.8-serfassertion/subversion/tests/cmdline/merge_tests.py:900822-900868
+/subversion/branches/1.6.x-3242-partial-fixes/subversion/tests/cmdline/merge_tests.py:931279-932637
+/subversion/branches/1.6.x-UNC-paths/subversion/tests/cmdline/merge_tests.py:876471-876545
+/subversion/branches/1.6.x-dirent-basename/subversion/tests/cmdline/merge_tests.py:876130-876262
+/subversion/branches/1.6.x-future-proof/subversion/tests/cmdline/merge_tests.py:880259-884209
+/subversion/branches/1.6.x-issue-3242-partial/subversion/tests/cmdline/merge_tests.py:916088-923778
+/subversion/branches/1.6.x-issue3390/subversion/tests/cmdline/merge_tests.py:907042-927863
+/subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/merge_tests.py:878598-924025
+/subversion/branches/1.6.x-issue3443/subversion/tests/cmdline/merge_tests.py:878597-879480
+/subversion/branches/1.6.x-issue3469/subversion/tests/cmdline/merge_tests.py:945700-953293
+/subversion/branches/1.6.x-issue3519/subversion/tests/cmdline/merge_tests.py:880376-889934
+/subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/merge_tests.py:906488-923765
+/subversion/branches/1.6.x-issue3605/subversion/tests/cmdline/merge_tests.py:923668-923887
+/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/merge_tests.py:876360-876415
+/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884
+/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/merge_tests.py:876328-876788
+/subversion/branches/1.6.x-r37622/subversion/tests/cmdline/merge_tests.py:877699-877993
+/subversion/branches/1.6.x-r37627/subversion/tests/cmdline/merge_tests.py:877704-877928
+/subversion/branches/1.6.x-r37857/subversion/tests/cmdline/merge_tests.py:877932-877936
+/subversion/branches/1.6.x-r37953/subversion/tests/cmdline/merge_tests.py:879809-880071
+/subversion/branches/1.6.x-r37988/subversion/tests/cmdline/merge_tests.py:878063-878897
+/subversion/branches/1.6.x-r38000/subversion/tests/cmdline/merge_tests.py:879083-879767
+/subversion/branches/1.6.x-r38222/subversion/tests/cmdline/merge_tests.py:878299-878891
+/subversion/branches/1.6.x-r38572/subversion/tests/cmdline/merge_tests.py:878661-878666
+/subversion/branches/1.6.x-r38799/subversion/tests/cmdline/merge_tests.py:878880-878917
+/subversion/branches/1.6.x-r38836/subversion/tests/cmdline/merge_tests.py:878911-952818
+/subversion/branches/1.6.x-r38927/subversion/tests/cmdline/merge_tests.py:879002-879176
+/subversion/branches/1.6.x-r39019/subversion/tests/cmdline/merge_tests.py:879132-895676
+/subversion/branches/1.6.x-r39109/subversion/tests/cmdline/merge_tests.py:879131
+/subversion/branches/1.6.x-r39557/subversion/tests/cmdline/merge_tests.py:879668-879907
+/subversion/branches/1.6.x-r39887/subversion/tests/cmdline/merge_tests.py:880024-880066
+/subversion/branches/1.6.x-r40452/subversion/tests/cmdline/merge_tests.py:880530-890996
+/subversion/branches/1.6.x-r889840/subversion/tests/cmdline/merge_tests.py:889888-890974
+/subversion/branches/1.6.x-r891672/subversion/tests/cmdline/merge_tests.py:891676-923748
+/subversion/branches/1.6.x-r892050/subversion/tests/cmdline/merge_tests.py:923839-923856
+/subversion/branches/1.6.x-r896522/subversion/tests/cmdline/merge_tests.py:896528-897866
+/subversion/branches/1.6.x-r898963/subversion/tests/cmdline/merge_tests.py:899874-915098
+/subversion/branches/1.6.x-r905326/subversion/tests/cmdline/merge_tests.py:905545-923537
+/subversion/branches/1.6.x-r923389/subversion/tests/cmdline/merge_tests.py:927445-929628
+/subversion/branches/1.6.x-r926151/subversion/tests/cmdline/merge_tests.py:927922-929631
+/subversion/branches/1.6.x-r933299/subversion/tests/cmdline/merge_tests.py:933310-934492
+/subversion/branches/1.6.x-r935996/subversion/tests/cmdline/merge_tests.py:936212-952816
+/subversion/branches/1.6.x-wc-ng-check-override/subversion/tests/cmdline/merge_tests.py:910213-923776
+/subversion/branches/1.6.x-wc-ng-error/subversion/tests/cmdline/merge_tests.py:929379-929636
+/subversion/branches/bdb-reverse-deltas/subversion/tests/cmdline/merge_tests.py:872050-872529
+/subversion/branches/diff-callbacks3/subversion/tests/cmdline/merge_tests.py:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/tests/cmdline/merge_tests.py:870728-871118
+/subversion/branches/double-delete/subversion/tests/cmdline/merge_tests.py:870511-872970
+/subversion/branches/file-externals/subversion/tests/cmdline/merge_tests.py:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/tests/cmdline/merge_tests.py:869036-873803
+/subversion/branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py:873717-874575
+/subversion/branches/gnome-keyring/subversion/tests/cmdline/merge_tests.py:870558-871410
+/subversion/branches/http-protocol-v2/subversion/tests/cmdline/merge_tests.py:875632
+/subversion/branches/in-memory-cache/subversion/tests/cmdline/merge_tests.py:869829-871452
+/subversion/branches/issue-2843-dev/subversion/tests/cmdline/merge_tests.py:871432-874179
+/subversion/branches/issue-3000/subversion/tests/cmdline/merge_tests.py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/merge_tests.py:873375-874084
+/subversion/branches/issue-3148-dev/subversion/tests/cmdline/merge_tests.py:875193-875204
+/subversion/branches/issue-3220-dev/subversion/tests/cmdline/merge_tests.py:872210-872226
+/subversion/branches/issue-3242-dev/subversion/tests/cmdline/merge_tests.py:879762,880472,880579
+/subversion/branches/issue-3334-dirs/subversion/tests/cmdline/merge_tests.py:875156-875867
+/subversion/branches/kwallet/subversion/tests/cmdline/merge_tests.py:870785-871314
+/subversion/branches/log-g-performance/subversion/tests/cmdline/merge_tests.py:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/tests/cmdline/merge_tests.py:874525-874615
+/subversion/branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/merge_tests.py:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff/subversion/tests/cmdline/merge_tests.py:871905,871986
+/subversion/branches/svnserve-logging/subversion/tests/cmdline/merge_tests.py:869828-870893
+/subversion/branches/tc-issue-3334/subversion/tests/cmdline/merge_tests.py:874697-874773
+/subversion/branches/tc-merge-notify/subversion/tests/cmdline/merge_tests.py:874017-874062
+/subversion/branches/tc-resolve/subversion/tests/cmdline/merge_tests.py:874191-874239
+/subversion/branches/tc_url_rev/subversion/tests/cmdline/merge_tests.py:874351-874483
+/subversion/branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/merge_tests.py:873926-874008
+/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py:953878
+/subversion/trunk/subversion/tests/cmdline/merge_tests.py: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,877544,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,87
9357,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