You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/09/30 17:22:50 UTC
svn commit: r1003100 - in /subversion/branches/1.6.x-r877814: ./
subversion/tests/cmdline/merge_authz_tests.py
subversion/tests/cmdline/merge_tests.py
Author: stsp
Date: Thu Sep 30 15:22:49 2010
New Revision: 1003100
URL: http://svn.apache.org/viewvc?rev=1003100&view=rev
Log:
On the 1.6.x-r877814 branch, merge r877814 from trunk, resolving conflicts.
Modified:
subversion/branches/1.6.x-r877814/ (props changed)
subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py (contents, props changed)
Propchange: subversion/branches/1.6.x-r877814/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 15:22:49 2010
@@ -93,4 +93,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,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,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,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094
+/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,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,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094
Modified: subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_authz_tests.py?rev=1003100&r1=1003099&r2=1003100&view=diff
==============================================================================
--- subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_authz_tests.py Thu Sep 30 15:22:49 2010
@@ -32,12 +32,13 @@ SkipUnless = svntest.testcase.SkipUnless
from merge_tests import set_up_branch
from merge_tests import expected_merge_output
-
from svntest.main import is_ra_type_dav
from svntest.main import is_ra_type_svn
from svntest.main import SVN_PROP_MERGEINFO
from svntest.main import write_restrictive_svnserve_conf
from svntest.main import write_authz_file
+from svntest.main import is_ra_type_dav
+from svntest.main import is_ra_type_svn
from svntest.main import server_has_mergeinfo
from svntest.actions import fill_file_with_lines
from svntest.actions import make_conflict_marker_text
@@ -359,7 +360,6 @@ def mergeinfo_and_skipped_paths(sbox):
None, None, None, None,
None, 1, 0, '-c5', '-c8')
-
# Test issue #2829 'Improve handling for skipped paths encountered
# during a merge'
@@ -528,6 +528,125 @@ def reintegrate_fails_if_no_root_access(
None, True, True,
'--reintegrate')
+def merge_fails_if_subtree_is_deleted_on_src(sbox):
+ "merge fails if subtree is deleted on src"
+
+ ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2876. ##
+
+ # Create a WC
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ if is_ra_type_svn() or is_ra_type_dav():
+ write_authz_file(sbox, {"/" : "* = rw",
+ "/unrelated" : ("* =\n" +
+ svntest.main.wc_author2 + " = rw")})
+
+ # Some paths we'll care about
+ Acopy_path = os.path.join(wc_dir, 'A_copy')
+ gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
+ Acopy_gamma_path = os.path.join(wc_dir, 'A_copy', 'D', 'gamma')
+ Acopy_D_path = os.path.join(wc_dir, 'A_copy', 'D')
+ A_url = sbox.repo_url + '/A'
+ Acopy_url = sbox.repo_url + '/A_copy'
+
+ # Contents to be added to 'gamma'
+ new_content = "line1\nline2\nline3\nline4\nline5\n"
+
+ svntest.main.file_write(gamma_path, new_content)
+
+ # Create expected output tree for commit
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(verb='Sending'),
+ })
+
+ # Create expected status tree for commit
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/D/gamma', wc_rev=2)
+
+ # Commit the new content
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status, None, wc_dir)
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp', A_url, Acopy_url,
+ '-m', 'create a new copy of A')
+
+ # Update working copy
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+
+ svntest.main.file_substitute(gamma_path, "line1", "this is line1")
+ # Create expected output tree for commit
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(verb='Sending'),
+ })
+
+ # Create expected status tree for commit
+ expected_status.tweak(wc_rev=3)
+ expected_status.tweak('A/D/gamma', wc_rev=4)
+ expected_status.add({
+ 'A_copy' : Item(status=' ', wc_rev=3),
+ 'A_copy/B' : Item(status=' ', wc_rev=3),
+ 'A_copy/B/lambda' : Item(status=' ', wc_rev=3),
+ 'A_copy/B/E' : Item(status=' ', wc_rev=3),
+ 'A_copy/B/E/alpha': Item(status=' ', wc_rev=3),
+ 'A_copy/B/E/beta' : Item(status=' ', wc_rev=3),
+ 'A_copy/B/F' : Item(status=' ', wc_rev=3),
+ 'A_copy/mu' : Item(status=' ', wc_rev=3),
+ 'A_copy/C' : Item(status=' ', wc_rev=3),
+ 'A_copy/D' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/gamma' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/G' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/G/pi' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/G/rho' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/G/tau' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/H' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/H/chi' : Item(status=' ', wc_rev=3),
+ 'A_copy/D/H/omega': Item(status=' ', wc_rev=3),
+ 'A_copy/D/H/psi' : Item(status=' ', wc_rev=3),
+ })
+
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status, None, wc_dir)
+
+ # Delete A/D/gamma from working copy
+ svntest.actions.run_and_verify_svn(None, None, [], 'delete', gamma_path)
+ # Create expected output tree for commit
+ expected_output = wc.State(wc_dir, {
+ 'A/D/gamma' : Item(verb='Deleting'),
+ })
+
+ expected_status.remove('A/D/gamma')
+
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None,
+ wc_dir, wc_dir)
+ svntest.actions.run_and_verify_svn(None, expected_merge_output([[3,4]],
+ 'U ' + Acopy_gamma_path + '\n'),
+ [], 'merge', '-r1:4',
+ A_url + '/D/gamma' + '@4',
+ Acopy_gamma_path)
+
+ # r6: create an empty (unreadable) commit.
+ # Empty or unreadable revisions used to crash a svn 1.6+ client when
+ # used with a 1.5 server:
+ # http://svn.haxx.se/dev/archive-2009-04/0476.shtml
+ svntest.main.run_svn(None, 'mkdir', sbox.repo_url + '/unrelated',
+ '--username', svntest.main.wc_author2,
+ '-m', 'creating a rev with no paths.')
+
+ # This merge causes a tree conflict. Since the result of the previous
+ # merge of A/D/gamma into A_copy/D has not yet been committed, it is
+ # considered a local modification of A_Copy/D/gamma by the following
+ # merge. A delete merged ontop of a modified file is a tree conflict.
+ # See notes/tree-conflicts/detection.txt
+ svntest.actions.run_and_verify_svn(None, expected_merge_output([[6], [3,6]],
+ ['D ' + Acopy_gamma_path + '\n',
+ 'C ' + Acopy_D_path + '\n']),
+ [], 'merge', '-r1:6', '--force',
+ A_url, Acopy_path)
+
########################################################################
# Run the tests
@@ -540,6 +659,8 @@ test_list = [ None,
SkipUnless(Skip(reintegrate_fails_if_no_root_access,
svntest.main.is_ra_type_file),
svntest.main.server_has_mergeinfo),
+ SkipUnless(merge_fails_if_subtree_is_deleted_on_src,
+ server_has_mergeinfo),
]
if __name__ == '__main__':
Modified: subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py?rev=1003100&r1=1003099&r2=1003100&view=diff
==============================================================================
--- subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py Thu Sep 30 15:22:49 2010
@@ -33,9 +33,6 @@ SkipUnless = svntest.testcase.SkipUnless
from svntest.main import SVN_PROP_MERGEINFO
from svntest.main import server_has_mergeinfo
-from svntest.main import write_authz_file
-from svntest.main import is_ra_type_dav
-from svntest.main import is_ra_type_svn
from svntest.actions import fill_file_with_lines
from svntest.actions import make_conflict_marker_text
from svntest.actions import inject_conflict_into_expected_state
@@ -7006,124 +7003,6 @@ def merge_with_depth_files(sbox):
None, None, None, None, None, 1, 1,
'--depth', 'files')
-def merge_fails_if_subtree_is_deleted_on_src(sbox):
- "merge fails if subtree is deleted on src"
-
- ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2876. ##
-
- # Create a WC
- sbox.build()
- wc_dir = sbox.wc_dir
-
- if is_ra_type_svn() or is_ra_type_dav():
- write_authz_file(sbox, {"/" : "* = rw",
- "/unrelated" : ("* =\n" +
- svntest.main.wc_author2 + " = rw")})
-
- # Some paths we'll care about
- Acopy_path = os.path.join(wc_dir, 'A_copy')
- gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
- Acopy_gamma_path = os.path.join(wc_dir, 'A_copy', 'D', 'gamma')
- Acopy_D_path = os.path.join(wc_dir, 'A_copy', 'D')
- A_url = sbox.repo_url + '/A'
- Acopy_url = sbox.repo_url + '/A_copy'
-
- # Contents to be added to 'gamma'
- new_content = "line1\nline2\nline3\nline4\nline5\n"
-
- svntest.main.file_write(gamma_path, new_content)
-
- # Create expected output tree for commit
- expected_output = wc.State(wc_dir, {
- 'A/D/gamma' : Item(verb='Sending'),
- })
-
- # Create expected status tree for commit
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak('A/D/gamma', wc_rev=2)
-
- # Commit the new content
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
-
- svntest.actions.run_and_verify_svn(None, None, [], 'cp', A_url, Acopy_url,
- '-m', 'create a new copy of A')
-
- # Update working copy
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-
- svntest.main.file_substitute(gamma_path, "line1", "this is line1")
- # Create expected output tree for commit
- expected_output = wc.State(wc_dir, {
- 'A/D/gamma' : Item(verb='Sending'),
- })
-
- # Create expected status tree for commit
- expected_status.tweak(wc_rev=3)
- expected_status.tweak('A/D/gamma', wc_rev=4)
- expected_status.add({
- 'A_copy' : Item(status=' ', wc_rev=3),
- 'A_copy/B' : Item(status=' ', wc_rev=3),
- 'A_copy/B/lambda' : Item(status=' ', wc_rev=3),
- 'A_copy/B/E' : Item(status=' ', wc_rev=3),
- 'A_copy/B/E/alpha': Item(status=' ', wc_rev=3),
- 'A_copy/B/E/beta' : Item(status=' ', wc_rev=3),
- 'A_copy/B/F' : Item(status=' ', wc_rev=3),
- 'A_copy/mu' : Item(status=' ', wc_rev=3),
- 'A_copy/C' : Item(status=' ', wc_rev=3),
- 'A_copy/D' : Item(status=' ', wc_rev=3),
- 'A_copy/D/gamma' : Item(status=' ', wc_rev=3),
- 'A_copy/D/G' : Item(status=' ', wc_rev=3),
- 'A_copy/D/G/pi' : Item(status=' ', wc_rev=3),
- 'A_copy/D/G/rho' : Item(status=' ', wc_rev=3),
- 'A_copy/D/G/tau' : Item(status=' ', wc_rev=3),
- 'A_copy/D/H' : Item(status=' ', wc_rev=3),
- 'A_copy/D/H/chi' : Item(status=' ', wc_rev=3),
- 'A_copy/D/H/omega': Item(status=' ', wc_rev=3),
- 'A_copy/D/H/psi' : Item(status=' ', wc_rev=3),
- })
-
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
-
- # Delete A/D/gamma from working copy
- svntest.actions.run_and_verify_svn(None, None, [], 'delete', gamma_path)
- # Create expected output tree for commit
- expected_output = wc.State(wc_dir, {
- 'A/D/gamma' : Item(verb='Deleting'),
- })
-
- expected_status.remove('A/D/gamma')
-
- svntest.actions.run_and_verify_commit(wc_dir,
- expected_output,
- expected_status,
- None,
- wc_dir, wc_dir)
- svntest.actions.run_and_verify_svn(None, expected_merge_output([[3,4]],
- 'U ' + Acopy_gamma_path + '\n'),
- [], 'merge', '-r1:4',
- A_url + '/D/gamma' + '@4',
- Acopy_gamma_path)
-
- # r6: create an empty (unreadable) commit.
- # Empty or unreadable revisions used to crash a svn 1.6+ client when
- # used with a 1.5 server:
- # http://svn.haxx.se/dev/archive-2009-04/0476.shtml
- svntest.main.run_svn(None, 'mkdir', sbox.repo_url + '/unrelated',
- '--username', svntest.main.wc_author2,
- '-m', 'creating a rev with no paths.')
-
- # This merge causes a tree conflict. Since the result of the previous
- # merge of A/D/gamma into A_copy/D has not yet been committed, it is
- # considered a local modification of A_Copy/D/gamma by the following
- # merge. A delete merged ontop of a modified file is a tree conflict.
- # See notes/tree-conflicts/detection.txt
- svntest.actions.run_and_verify_svn(None, expected_merge_output([[6], [3,6]],
- ['D ' + Acopy_gamma_path + '\n',
- 'C ' + Acopy_D_path + '\n']),
- [], 'merge', '-r1:6', '--force',
- A_url, Acopy_path)
# Test for issue #2976 Subtrees can lose non-inheritable ranges.
#
@@ -16967,8 +16846,6 @@ test_list = [ None,
server_has_mergeinfo),
SkipUnless(merge_with_depth_files,
server_has_mergeinfo),
- SkipUnless(merge_fails_if_subtree_is_deleted_on_src,
- server_has_mergeinfo),
SkipUnless(merge_away_subtrees_noninheritable_ranges,
server_has_mergeinfo),
SkipUnless(merge_to_sparse_directories,
Propchange: subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 15:22:49 2010
@@ -93,4 +93,4 @@
/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,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,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,87
9293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,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,934599,934603,935631,935992,935996,937610,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984928,984931,1000038,1000060,1000607,1000612,1001009,1002094
+/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,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,877459,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,87
9271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,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,934599,934603,935631,935992,935996,937610,944635,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984928,984931,1000038,1000060,1000607,1000612,1001009,1002094