You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by bl...@apache.org on 2010/12/28 22:50:34 UTC
svn commit: r1053454 - in /subversion/branches/1.6.x-svn_fs_commit_txn: ./
subversion/include/private/ subversion/libsvn_repos/
subversion/mod_dav_svn/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/
Author: blair
Date: Tue Dec 28 21:50:34 2010
New Revision: 1053454
URL: http://svn.apache.org/viewvc?rev=1053454&view=rev
Log:
On the 1.6.x-svn_fs_commit_txn branch, merge in r1051778 from trunk.
Additionally:
* subversion/libsvn_repos/load.c
(close_revision):
Apply the change from trunk that was done in
subversion/libsvn_repos/load-fs-vtable.c.
* subversion/libsvn_repos/load-fs-vtable.c:
Revert the tree conflict because this file does not exist in the
branch.
* subversion/mod_dav_svn/lock.c
(append_locks):
Replace calls to dav_svn__new_error() with dav_new_error().
* subversion/mod_dav_svn/version.c:
(dav_svn__checkin),
(merge):
Replace calls to dav_svn__new_error() with dav_new_error().
Original message:
Have all remaining calls of svn_fs_commit_txn() and
svn_repos_fs_commit_txn() use the contract that a commit was
successful if the returned revision is a valid revision number. The
returned error, if any, is no longer used as an indication of commit
success.
* subversion/mod_dav_svn/version.c
(dav_svn__checkin),
(merge):
Use revision number returned from svn_repos_fs_commit_txn() to
test for a successful commit.
* subversion/mod_dav_svn/lock.c
(append_locks):
Ditto.
* subversion/libsvn_repos/load-fs-vtable.c
(close_revision):
Ditto.
* subversion/libsvn_repos/commit.c
(close_edit):
Ditto.
Modified:
subversion/branches/1.6.x-svn_fs_commit_txn/ (props changed)
subversion/branches/1.6.x-svn_fs_commit_txn/CHANGES (props changed)
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/include/private/svn_repos_private.h (props changed)
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/commit.c
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/load.c
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/lock.c
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/version.c
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/tests/cmdline/merge_tests.py (props changed)
subversion/branches/1.6.x-svn_fs_commit_txn/subversion/tests/cmdline/svntest/main.py (props changed)
Propchange: subversion/branches/1.6.x-svn_fs_commit_txn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 21:50:34 2010
@@ -100,4 +100,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,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,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,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1039040,1041438,1051733,1051761,1051763,1051775
+/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,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,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1039040,1041438,1051733,1051761,1051763,1051775,1051778
Propchange: subversion/branches/1.6.x-svn_fs_commit_txn/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 21:50:34 2010
@@ -98,4 +98,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-1038588,1041438,1051733,1051761,1051763,1051775
+/subversion/trunk/CHANGES:837701-841355,875962-1038588,1041438,1051733,1051761,1051763,1051775,1051778
Propchange: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/include/private/svn_repos_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 21:50:34 2010
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev/subversion/include/private/svn_repos_private.h:874351-874483
/subversion/branches/tree-conflicts/subversion/include/private/svn_repos_private.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/private/svn_repos_private.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_repos_private.h:1051775
+/subversion/trunk/subversion/include/private/svn_repos_private.h:1051775,1051778
Modified: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/commit.c?rev=1053454&r1=1053453&r2=1053454&view=diff
==============================================================================
--- subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/commit.c Tue Dec 28 21:50:34 2010
@@ -720,9 +720,9 @@ close_edit(void *edit_baton,
err = svn_repos_fs_commit_txn(&conflict, eb->repos,
&new_revision, eb->txn, pool);
- if (err)
+ if (SVN_IS_VALID_REVNUM(new_revision))
{
- if (err->apr_err == SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED)
+ if (err)
{
/* If the error was in post-commit, then the commit itself
succeeded. In which case, save the post-commit warning
@@ -733,28 +733,28 @@ close_edit(void *edit_baton,
svn_error_clear(err);
err = SVN_NO_ERROR;
}
- else /* Got a real error -- one that stopped the commit */
- {
- /* ### todo: we should check whether it really was a conflict,
- and return the conflict info if so? */
+ }
+ else
+ {
+ /* ### todo: we should check whether it really was a conflict,
+ and return the conflict info if so? */
- /* If the commit failed, it's *probably* due to a conflict --
- that is, the txn being out-of-date. The filesystem gives us
- the ability to continue diddling the transaction and try
- again; but let's face it: that's not how the cvs or svn works
- from a user interface standpoint. Thus we don't make use of
- this fs feature (for now, at least.)
-
- So, in a nutshell: svn commits are an all-or-nothing deal.
- Each commit creates a new fs txn which either succeeds or is
- aborted completely. No second chances; the user simply
- needs to update and commit again :)
-
- We ignore the possible error result from svn_fs_abort_txn();
- it's more important to return the original error. */
- svn_error_clear(svn_fs_abort_txn(eb->txn, pool));
- return err;
- }
+ /* If the commit failed, it's *probably* due to a conflict --
+ that is, the txn being out-of-date. The filesystem gives us
+ the ability to continue diddling the transaction and try
+ again; but let's face it: that's not how the cvs or svn works
+ from a user interface standpoint. Thus we don't make use of
+ this fs feature (for now, at least.)
+
+ So, in a nutshell: svn commits are an all-or-nothing deal.
+ Each commit creates a new fs txn which either succeeds or is
+ aborted completely. No second chances; the user simply
+ needs to update and commit again :)
+
+ We ignore the possible error result from svn_fs_abort_txn();
+ it's more important to return the original error. */
+ svn_error_clear(svn_fs_abort_txn(eb->txn, pool));
+ return err;
}
/* Pass new revision information to the caller's callback. */
Modified: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/load.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/load.c?rev=1053454&r1=1053453&r2=1053454&view=diff
==============================================================================
--- subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/load.c (original)
+++ subversion/branches/1.6.x-svn_fs_commit_txn/subversion/libsvn_repos/load.c Tue Dec 28 21:50:34 2010
@@ -1337,7 +1337,18 @@ close_revision(void *baton)
}
/* Commit. */
- if ((err = svn_fs_commit_txn(&conflict_msg, new_rev, rb->txn, rb->pool)))
+ err = svn_fs_commit_txn(&conflict_msg, new_rev, rb->txn, rb->pool);
+ if (SVN_IS_VALID_REVNUM(*new_rev))
+ {
+ if (err)
+ {
+ /* ### Log any error, but better yet is to rev
+ ### close_revision()'s API to allow both new_rev and err
+ ### to be returned, see #3768. */
+ svn_error_clear(err);
+ }
+ }
+ else
{
svn_error_clear(svn_fs_abort_txn(rb->txn, rb->pool));
if (conflict_msg)
Modified: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/lock.c?rev=1053454&r1=1053453&r2=1053454&view=diff
==============================================================================
--- subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/lock.c (original)
+++ subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/lock.c Tue Dec 28 21:50:34 2010
@@ -707,15 +707,28 @@ append_locks(dav_lockdb *lockdb,
"Could not create empty file.",
resource->pool);
- if ((serr = svn_repos_fs_commit_txn(&conflict_msg, repos->repos,
- &new_rev, txn, resource->pool)))
+ serr = svn_repos_fs_commit_txn(&conflict_msg, repos->repos,
+ &new_rev, txn, resource->pool);
+ if (SVN_IS_VALID_REVNUM(new_rev))
+ {
+ svn_error_clear(serr);
+ }
+ else
{
svn_error_clear(svn_fs_abort_txn(txn, resource->pool));
- return dav_svn__convert_err(serr, HTTP_CONFLICT,
- apr_psprintf(resource->pool,
- "Conflict when committing "
- "'%s'.", conflict_msg),
- resource->pool);
+ if (serr)
+ return dav_svn__convert_err(serr, HTTP_CONFLICT,
+ apr_psprintf(resource->pool,
+ "Conflict when "
+ "committing '%s'.",
+ conflict_msg),
+ resource->pool);
+ else
+ return dav_new_error(resource->pool,
+ HTTP_INTERNAL_SERVER_ERROR,
+ 0,
+ "Commit failed but there was no error "
+ "provided.");
}
}
Modified: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/version.c?rev=1053454&r1=1053453&r2=1053454&view=diff
==============================================================================
--- subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/1.6.x-svn_fs_commit_txn/subversion/mod_dav_svn/version.c Tue Dec 28 21:50:34 2010
@@ -847,30 +847,56 @@ dav_svn__checkin(dav_resource *resource,
resource->info->root.txn,
resource->pool);
- if (serr != NULL)
+ if (SVN_IS_VALID_REVNUM(new_rev))
+ {
+ if (serr)
+ {
+ const char *post_commit_err = svn_repos__post_commit_error_str
+ (serr, resource->pool);
+ ap_log_perror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ resource->pool,
+ "commit of r%ld succeeded, but an error occurred "
+ "after the commit: '%s'",
+ new_rev,
+ post_commit_err);
+ svn_error_clear(serr);
+ }
+ }
+ else
{
const char *msg;
svn_error_clear(svn_fs_abort_txn(resource->info->root.txn,
resource->pool));
- if (serr->apr_err == SVN_ERR_FS_CONFLICT)
- {
- msg = apr_psprintf(resource->pool,
- "A conflict occurred during the CHECKIN "
- "processing. The problem occurred with "
- "the \"%s\" resource.",
- conflict_msg);
- }
- else
- msg = "An error occurred while committing the transaction.";
-
/* Attempt to destroy the shared activity. */
dav_svn__delete_activity(resource->info->repos, shared_activity);
apr_pool_userdata_set(NULL, DAV_SVN__AUTOVERSIONING_ACTIVITY,
NULL, resource->info->r->pool);
- return dav_svn__convert_err(serr, HTTP_CONFLICT, msg,
- resource->pool);
+ if (serr)
+ {
+ if (serr->apr_err == SVN_ERR_FS_CONFLICT)
+ {
+ msg = apr_psprintf(resource->pool,
+ "A conflict occurred during the CHECKIN "
+ "processing. The problem occurred with "
+ "the \"%s\" resource.",
+ conflict_msg);
+ }
+ else
+ msg = "An error occurred while committing the transaction.";
+
+ return dav_svn__convert_err(serr, HTTP_CONFLICT, msg,
+ resource->pool);
+ }
+ else
+ {
+ return dav_new_error(resource->pool,
+ HTTP_INTERNAL_SERVER_ERROR,
+ 0,
+ "Commit failed but there was no error "
+ "provided.");
+ }
}
/* Attempt to destroy the shared activity. */
@@ -1309,34 +1335,50 @@ merge(dav_resource *target,
serr = svn_repos_fs_commit_txn(&conflict, source->info->repos->repos,
&new_rev, txn, pool);
- /* If the error was just a post-commit hook failure, we ignore it.
- Otherwise, we deal with it.
- ### TODO: Figure out if the MERGE response can grow a means by
+ /* ### TODO: Figure out if the MERGE response can grow a means by
which to marshal back both the success of the commit (and its
commit info) and the failure of the post-commit hook. */
- if (serr && (serr->apr_err != SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED))
+ if (SVN_IS_VALID_REVNUM(new_rev))
+ {
+ if (serr)
+ {
+ /* ### Any error from svn_fs_commit_txn() itself, and not
+ ### the post-commit script, should be reported to the
+ ### client some other way than hijacking the post-commit
+ ### error message.*/
+ post_commit_err = svn_repos__post_commit_error_str(serr, pool);
+ svn_error_clear(serr);
+ }
+ }
+ else
{
- const char *msg;
svn_error_clear(svn_fs_abort_txn(txn, pool));
- if (serr->apr_err == SVN_ERR_FS_CONFLICT)
+ if (serr)
{
- /* ### we need to convert the conflict path into a URI */
- msg = apr_psprintf(pool,
- "A conflict occurred during the MERGE "
- "processing. The problem occurred with the "
- "\"%s\" resource.",
- conflict);
+ const char *msg;
+ if (serr->apr_err == SVN_ERR_FS_CONFLICT)
+ {
+ /* ### we need to convert the conflict path into a URI */
+ msg = apr_psprintf(pool,
+ "A conflict occurred during the MERGE "
+ "processing. The problem occurred with the "
+ "\"%s\" resource.",
+ conflict);
+ }
+ else
+ msg = "An error occurred while committing the transaction.";
+
+ return dav_svn__convert_err(serr, HTTP_CONFLICT, msg, pool);
}
else
- msg = "An error occurred while committing the transaction.";
-
- return dav_svn__convert_err(serr, HTTP_CONFLICT, msg, pool);
- }
- else if (serr)
- {
- post_commit_err = svn_repos__post_commit_error_str(serr, pool);
- svn_error_clear(serr);
+ {
+ return dav_new_error(pool,
+ HTTP_INTERNAL_SERVER_ERROR,
+ 0,
+ "Commit failed but there was no error "
+ "provided.");
+ }
}
/* Commit was successful, so schedule deltification. */
Propchange: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 21:50:34 2010
@@ -100,4 +100,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,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,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186,1032808,1033166,1033665,1033685,10
33921,1034557,1035745,1041438,1051733,1051761,1051763,1051775
+/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,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186,1032808,1033166,1033665,1033685,10
33921,1034557,1035745,1041438,1051733,1051761,1051763,1051775,1051778
Propchange: subversion/branches/1.6.x-svn_fs_commit_txn/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 21:50:34 2010
@@ -100,5 +100,5 @@
/subversion/branches/tc_url_rev/subversion/tests/cmdline/svntest/main.py:874351-874483
/subversion/branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/svntest/main.py:873926-874008
-/subversion/trunk/subversion/tests/cmdline/svntest/main.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-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,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,8
79201,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,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,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,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,1005
446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1041438,1051733,1051761,1051763,1051775
+/subversion/trunk/subversion/tests/cmdline/svntest/main.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-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,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,8
79201,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,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,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,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,1005
446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1041438,1051733,1051761,1051763,1051775,1051778
/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py:991972