Author: pburba Date: Tue Jun 8 20:10:38 2010 New Revision: 952795 URL: http://svn.apache.org/viewvc?rev=952795&view=rev Log: Merge r939375 from trunk to subversion/1.6.x-issue3623 branch.
* subversion/tests/cmdline/merge_tests.py (foreign_repos): We can merge cleanly by accepting theirs-conflict, but we still must account for the change in svntest.actions.verify_disk()'s parameters made in http://svn.apache.org/viewvc?view=revision&revision=876572. * src-branch-1.6.x * CHANGES Mergeinfo updates. Modified: subversion/branches/1.6.x-issue3623/ (props changed) subversion/branches/1.6.x-issue3623/CHANGES (props changed) subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py Propchange: subversion/branches/1.6.x-issue3623/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 8 20:10:38 2010 @@ -70,4 +70,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,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,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,87756 5,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,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,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,944635 +/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,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,87756 5,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,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,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,939375,944635 Propchange: subversion/branches/1.6.x-issue3623/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 8 20:10:38 2010 @@ -69,4 +69,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,944635 +/subversion/trunk/CHANGES:837701-841355,875962-934485,939375,944635 Modified: subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py?rev=952795&r1=952794&r2=952795&view=diff ============================================================================== --- subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py (original) +++ subversion/branches/1.6.x-issue3623/subversion/tests/cmdline/merge_tests.py Tue Jun 8 20:10:38 2010 @@ -10807,6 +10807,7 @@ def foreign_repos(sbox): # Convenience variables for working copy paths. Z_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z') + B_path = os.path.join(wc_dir, 'A', 'B') Q_path = os.path.join(wc_dir, 'Q') H_path = os.path.join(wc_dir, 'A', 'D', 'H') iota_path = os.path.join(wc_dir, 'iota') @@ -10815,21 +10816,24 @@ def foreign_repos(sbox): zeta_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Z', 'zeta') fred_path = os.path.join(wc_dir, 'A', 'C', 'fred') - # Add new directories + # Add new directories, with properties svntest.main.run_svn(None, 'mkdir', Q_path, Z_path) + svntest.main.run_svn(None, 'pset', 'foo', 'bar', Q_path, Z_path) - # Add new files + # Add new files, with contents and properties. zeta_contents = "This is the file 'zeta'.\n" fred_contents = "This is the file 'fred'.\n" svntest.main.file_append(zeta_path, zeta_contents) svntest.main.file_append(fred_path, fred_contents) svntest.main.run_svn(None, 'add', zeta_path, fred_path) - - # Modify existing files + svntest.main.run_svn(None, 'pset', 'foo', 'bar', zeta_path, fred_path) + + # Modify existing files and directories. added_contents = "This is another line of text.\n" svntest.main.file_append(iota_path, added_contents) svntest.main.file_append(beta_path, added_contents) - + svntest.main.run_svn(None, 'pset', 'foo', 'bar', iota_path, B_path) + # Delete some stuff svntest.main.run_svn(None, 'delete', alpha_path, H_path) @@ -10840,6 +10844,7 @@ def foreign_repos(sbox): 'A/D/G/Z/zeta' : Item(verb='Adding'), 'A/C/fred' : Item(verb='Adding'), 'iota' : Item(verb='Sending'), + 'A/B' : Item(verb='Sending'), 'A/B/E/beta' : Item(verb='Sending'), 'A/B/E/alpha' : Item(verb='Deleting'), 'A/D/H' : Item(verb='Deleting'), @@ -10851,21 +10856,23 @@ def foreign_repos(sbox): 'A/D/G/Z/zeta' : Item(status=' ', wc_rev=2), 'A/C/fred' : Item(status=' ', wc_rev=2), }) - expected_status.tweak('iota', 'A/B/E/beta', wc_rev=2) + expected_status.tweak('iota', 'A/B/E/beta', 'A/B', wc_rev=2) expected_status.remove('A/B/E/alpha', 'A/D/H', 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega') expected_disk = svntest.main.greek_state.copy() expected_disk.add({ - 'Q' : Item(), - 'A/D/G/Z' : Item(), - 'A/D/G/Z/zeta' : Item(contents=zeta_contents), - 'A/C/fred' : Item(contents=fred_contents), + 'Q' : Item(props={'foo':'bar'}), + 'A/D/G/Z' : Item(props={'foo':'bar'}), + 'A/D/G/Z/zeta' : Item(contents=zeta_contents,props={'foo':'bar'}), + 'A/C/fred' : Item(contents=fred_contents,props={'foo':'bar'}), }) expected_disk.remove('A/B/E/alpha', 'A/D/H', 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega') expected_disk.tweak('iota', contents=expected_disk.desc['iota'].contents - + added_contents) + + added_contents, + props={'foo':'bar'}) + expected_disk.tweak('A/B', props={'foo':'bar'}) expected_disk.tweak('A/B/E/beta', contents=expected_disk.desc['A/B/E/beta'].contents + added_contents) @@ -10887,6 +10894,14 @@ def foreign_repos(sbox): svntest.actions.verify_disk(wc_dir2, expected_disk, None, None, None, None, 1) + # Now, let's make a third checkout -- our second from the original + # repository -- and make sure that all the data there is correct. + # It should look just like the original EXPECTED_DISK. + wc_dir3 = sbox.add_wc_path('wc3') + svntest.actions.run_and_verify_svn(None, None, [], 'checkout', + sbox2.repo_url, wc_dir3) + svntest.actions.verify_disk(wc_dir3, expected_disk, + None, None, None, None, 1) def foreign_repos_uuid(sbox): "verify uuid of items added via foreign repo merge"
