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/17 21:00:01 UTC
svn commit: r955709 - in /subversion/branches/1.6.x-issue3242-reintegrate:
./ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_fs_base/bdb/ subversion/libsvn_fs_fs/
subversion/libsvn_ra_neon/ subversion/libsvn_ra_serf/ subversion...
Author: pburba
Date: Thu Jun 17 19:00:01 2010
New Revision: 955709
URL: http://svn.apache.org/viewvc?rev=955709&view=rev
Log:
On the 1.6.x-issue3242-reintegrate branch: Sync up to 955706 from 1.6.x.
Note: Accepted theirs-conflict for conflict on merge_tests.py caused by
r955342 -- See issue #3657.
Modified:
subversion/branches/1.6.x-issue3242-reintegrate/ (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/CHANGES (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/STATUS
subversion/branches/1.6.x-issue3242-reintegrate/subversion/include/private/svn_atomic.h
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs.h
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_neon/session.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_serf/win32_auth_sspi.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/atomic.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/sqlite.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/svnserve/cyrus_auth.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py (contents, props changed)
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 19:00:01 2010
@@ -1,5 +1,5 @@
/subversion/branches/1.5.x-r30215:870312
-/subversion/branches/1.6.x:954549-955342
+/subversion/branches/1.6.x:954549-955706
/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868
/subversion/branches/1.6.x-3242-partial-fixes:931279-932637
/subversion/branches/1.6.x-UNC-paths:876471-876545
@@ -11,10 +11,13 @@
/subversion/branches/1.6.x-issue3432:878598-924025
/subversion/branches/1.6.x-issue3443:878597-879480
/subversion/branches/1.6.x-issue3469:945700-953293
+/subversion/branches/1.6.x-issue3506:934622-955678
+/subversion/branches/1.6.x-issue3506-init_once:935083-955686
/subversion/branches/1.6.x-issue3519:880376-889934
/subversion/branches/1.6.x-issue3573:906488-923765
/subversion/branches/1.6.x-issue3605:923668-923887
/subversion/branches/1.6.x-issue3651:952977-954985
+/subversion/branches/1.6.x-issue3654:953882-955338
/subversion/branches/1.6.x-no-svn_uri:876360-876415
/subversion/branches/1.6.x-r36178:877876-877884
/subversion/branches/1.6.x-r36252:876328-876788
@@ -68,6 +71,7 @@
/subversion/branches/log-g-performance:870941-871032
/subversion/branches/merge-skips-obstructions:874525-874615
/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/subtree-mergeinfo:876855
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svnpatch-diff:871905,871986
/subversion/branches/svnserve-logging:869828-870893
@@ -77,4 +81,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,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,87754
4,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,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,935631,935992,935996,937610,944635,945350,950931,950933,951753,952992,953317
+/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,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,87754
4,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,944635,945350,950931,950933,951753,952992,953317
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 19:00:01 2010
@@ -1,5 +1,5 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
-/subversion/branches/1.6.x/CHANGES:954549-955342
+/subversion/branches/1.6.x/CHANGES:954549-955706
/subversion/branches/1.6.x-1.6.8-serfassertion/CHANGES:900822-900868
/subversion/branches/1.6.x-3242-partial-fixes/CHANGES:931279-932637
/subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
@@ -11,10 +11,13 @@
/subversion/branches/1.6.x-issue3432/CHANGES:878598-924025
/subversion/branches/1.6.x-issue3443/CHANGES:878597-879480
/subversion/branches/1.6.x-issue3469/CHANGES:945700-953293
+/subversion/branches/1.6.x-issue3506/CHANGES:934622-955678
+/subversion/branches/1.6.x-issue3506-init_once/CHANGES:935083-955686
/subversion/branches/1.6.x-issue3519/CHANGES:880376-889934
/subversion/branches/1.6.x-issue3573/CHANGES:906488-923765
/subversion/branches/1.6.x-issue3605/CHANGES:923668-923887
/subversion/branches/1.6.x-issue3651/CHANGES:952977-954985
+/subversion/branches/1.6.x-issue3654/CHANGES:953882-955338
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
@@ -67,6 +70,7 @@
/subversion/branches/log-g-performance/CHANGES:870941-871032
/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
+/subversion/branches/subtree-mergeinfo/CHANGES:876855
/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
/subversion/branches/svnpatch-diff/CHANGES:871905,871986
/subversion/branches/svnserve-logging/CHANGES:869828-870893
@@ -76,4 +80,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,935631,935992,935996,937610,944635,945350,950931,950933,951753,952992,953317
+/subversion/trunk/CHANGES:837701-841355,875962-934485,934599,934603,935631,935992,935996,937610,944635,945350,950931,950933,951753,952992,953317
Modified: subversion/branches/1.6.x-issue3242-reintegrate/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/STATUS?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/STATUS (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/STATUS Thu Jun 17 19:00:01 2010
@@ -31,39 +31,6 @@ Candidate changes:
works correctly. I think the not interactive code path
needs the same fix).
- * r879966, r879971
- Reduce the lifetime of the rep-sharing database handles in FSFS to avoid
- having writers blocking readers, and update that database outside the
- general FSFS write lock. This addresses issue #3506.
- Justification:
- The performance problems and outright failures of the current code
- are hurting the ASF repository, and presumably other high-concurrency
- repositories, too, when large commits occur.
- Justification:
- Pre-requisite for the r934599 group.
- Branch:
- ^/subversion/branches/1.6.x-issue3506
- Votes:
- +1: danielsh, cmpilato
-
- * r934599, r934603
- Fix a concurrency issue in the FSFS rep-cache code. This indirectly
- concerns issue #3506.
- Justification:
- Thread safety.
- Thread:
- http://article.gmane.org/gmane.comp.version-control.subversion.devel/119483
- Notes:
- r934599 updates the svn_atomic__init_once() interface.
- r934603 is the actual fix.
- Notes:
- Depends on the r879966 group, which does not merge cleanly.
- Branch:
- ^/subversion/branches/1.6.x-issue3506-init_once
- (based on ^/subversion/branches/1.6.x-issue3506)
- Votes:
- +1: danielsh
-
* r878590, r878607, r878625, r878626, r878627
In trunk we optimized the common case of 'find-and-replace with same uri'
of proxied content thanks to issue 3445 "WebDAV proxy code munging user
@@ -152,10 +119,10 @@ Candidate changes:
Notes:
r950445 fixes the issue and r950468 is a test for this issue.
Votes:
- +1: stylesen, cmpilato
- -0: julianfoad (Tested and works fine, but changes semantics of
- svn_io_dir_walk() which we should not do in a back-port.
- Discussing on list.)
+ +1: stylesen,
+ -0: julianfoad, cmpilato (Tested and works fine, but changes
+ semantics of svn_io_dir_walk() which we should not do in a
+ back-port. Discussing on list.)
Veto-blocked changes:
=====================
@@ -232,23 +199,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r953878, r876855
- Fix issue #3654 'Added subtrees with mergeinfo break reintegrate'
- Justification:
- In certain use cases, this bug breaks reintegrate merges. Love or
- hate reintegrate, many users like it and rely on it heavily. See
- http://subversion.tigris.org/issues/show_bug.cgi?id=3654 for more.
- Notes:
- r953878 is a new test for this issue.
- r876855 is from ^/subversion/branches/subtree-mergeinfo@876855 and is
- actual fix for this issue on 1.6.x. The subtree-mergeinfo branch is
- already on trunk in it's entirety, but we want only this small portion
- on 1.6.x.
- Branch:
- ^/subversion/branches/1.6.x-issue3654
- When reintegrating the branch use the '-x --ignore-eol-style' option or
- the entire merge_tests.py file conflicts. No idea why this is, the file
- has svn:eol-style native on both 1.6.x and the branch.
- Votes:
- +1: pburba, cmpilato, rhuijben
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/include/private/svn_atomic.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/include/private/svn_atomic.h?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/include/private/svn_atomic.h (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/include/private/svn_atomic.h Thu Jun 17 19:00:01 2010
@@ -100,14 +100,16 @@ extern "C" {
*
* @a global_status must be a pointer to a global, zero-initialized
* #svn_atomic_t. @a init_func is a pointer to the function that performs
- * the actual initialization, and @a pool is passed on to the init_func
- * for its use.
+ * the actual initialization. @a baton and and @a pool are passed on to the
+ * init_func for its use.
*
* @since New in 1.5.
*/
svn_error_t *
svn_atomic__init_once(volatile svn_atomic_t *global_status,
- svn_error_t *(*init_func)(apr_pool_t*), apr_pool_t* pool);
+ svn_error_t *(*init_func)(void*,apr_pool_t*),
+ void *baton,
+ apr_pool_t* pool);
#ifdef __cplusplus
}
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c Thu Jun 17 19:00:01 2010
@@ -4856,13 +4856,12 @@ struct get_mergeinfo_walk_baton
Given PATH, its corresponding ENTRY, and WB, where WB is the WALK_BATON
of type "struct get_mergeinfo_walk_baton *": If PATH is switched,
- has explicit working svn:mergeinfo from the corresponding merge source and
- this walk is being done as part of a forward merge or has *any* explicit
- working svn:mergeinfo and this walk is being done as part of a reverse
- merge, is missing a child due to a sparse checkout, is absent from disk,
- is scheduled for deletion, then create a svn_client__merge_path_t *
- representing *PATH, allocated in BATON->POOL, and
- push it onto the WB->CHILDREN_WITH_MERGEINFO array. */
+ has explicit working svn:mergeinfo, is missing a child due to a sparse
+ checkout, is absent from disk, is scheduled for deletion, or if the walk
+ is being done as part of a reverse merge, then create a
+ svn_client__merge_path_t *representing *PATH, allocated in
+ WB->CHILDREN_WITH_MERGEINFO->POOL, and push it onto the
+ WB->CHILDREN_WITH_MERGEINFO array. */
static svn_error_t *
get_mergeinfo_walk_cb(const char *path,
const svn_wc_entry_t *entry,
@@ -4871,9 +4870,8 @@ get_mergeinfo_walk_cb(const char *path,
{
struct get_mergeinfo_walk_baton *wb = walk_baton;
const svn_string_t *propval;
- svn_mergeinfo_t mergehash;
svn_boolean_t switched = FALSE;
- svn_boolean_t has_mergeinfo_from_merge_src = FALSE;
+ svn_boolean_t has_mergeinfo = FALSE;
svn_boolean_t path_is_merge_target =
!svn_path_compare_paths(path, wb->merge_target_path);
const char *parent_path = svn_path_dirname(path, pool);
@@ -4902,111 +4900,9 @@ get_mergeinfo_walk_cb(const char *path,
{
SVN_ERR(svn_wc_prop_get(&propval, SVN_PROP_MERGEINFO, path,
wb->base_access, pool));
- /* We always include the merge target regardless of its mergeinfo.
- So we don't need to check that PATH's mergeinfo corresponds to
- the merge source. */
- if (propval && !path_is_merge_target)
- {
- svn_stringbuf_t *merge_src_child_path =
- svn_stringbuf_create(wb->merge_src_canon_path, pool);
-
- /* When the merge target is '' or '.' WB->MERGE_TARGET_PATH is
- an empty string and PATH will always be relative. In this case
- we can safely combine WB->MERGE_SRC_CANON_PATH and PATH with
- svn_path_add_compent() which will supply the missing '/' separator.
-
- Otherwise WB->MERGE_TARGET_PATH is relative or absolute and
- we remove the common root component between WB->MERGE_TARGET_PATH
- and PATH from PATH before combining it with
- WB->MERGE_SRC_CANON_PATH. The +1 is required because if we are
- here that means WB->MERGE_TARGET_PATH is a proper ancestor of
- PATH and we must skip the path separator -- svn_path_add_compent()
- will add missing separators, but won't remove existing ones -- to
- avoid a merge_src_child_path with "//" in it. */
- if (strlen(wb->merge_target_path))
- svn_path_add_component(merge_src_child_path,
- path + strlen(wb->merge_target_path) + 1);
- else
- svn_path_add_component(merge_src_child_path,
- path);
- SVN_ERR(svn_mergeinfo_parse(&mergehash, propval->data, pool));
- if (wb->revision1 > wb->revision2 /* Reverse merge. */
- || propval->len == 0 /* empty mergeinfo */
- || apr_hash_get(mergehash, merge_src_child_path->data,
- APR_HASH_KEY_STRING))
- {
- /* The easy way: PATH already has mergeinfo
- from this source or has empty mergeinfo... */
- has_mergeinfo_from_merge_src = TRUE;
- }
- else
- {
- /* ...the slightly harder way: See if PATH exists in the
- merge source at the revisions being merged. If it doesn't
- exist there is no way this subtree can be affected by the
- merge so we can safely leave it, and its mergeinfo, alone. */
- svn_error_t *err;
- const char *original_ra_url = NULL;
- const char *mergeinfo_url =
- svn_path_url_add_component2(wb->source_root_url,
- /* Skip leading '/'. */
- merge_src_child_path->data + 1,
- pool);
- svn_opt_revision_t *start_revision, *end_revision;
- const char *start_url, *end_url;
- svn_opt_revision_t peg_rev, rev1_opt, rev2_opt;
-
- peg_rev.value.number = wb->revision1 < wb->revision2
- ? wb->revision2 : wb->revision1;
- peg_rev.kind = svn_opt_revision_number;
-
- rev1_opt.kind = svn_opt_revision_number;
- rev1_opt.value.number = wb->revision1;
-
- rev2_opt.kind = svn_opt_revision_number;
- rev2_opt.value.number = wb->revision2;
-
- /* Instead of passing NULL to svn_client__repos_locations() and
- causing another session to open, reparent WB->RA_SESSION
- and use that. */
- SVN_ERR(svn_client__ensure_ra_session_url(&original_ra_url,
- wb->ra_session,
- mergeinfo_url, pool));
-
- /* Does PATH exist in the merge source? */
- err = svn_client__repos_locations(&start_url, &start_revision,
- &end_url, &end_revision,
- wb->ra_session, mergeinfo_url,
- &peg_rev, &rev1_opt, &rev2_opt,
- wb->ctx, pool);
- if (err)
- {
- /* We might see any of these errors depending on the RA
- access method, but they all mean that PATH doesn't exist
- in the merge source.
-
- ### TODO: Make svn_client__repos_locations() more
- ### consistent in the error it returns(?)
- */
- if (err->apr_err == SVN_ERR_FS_NOT_FOUND
- || err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES)
- svn_error_clear(err);
- else
- return err;
- }
- else /* PATH does exist in the merge source*/
- {
- has_mergeinfo_from_merge_src = TRUE;
- }
+ if (propval)
+ has_mergeinfo = TRUE;
- /* Reparent the session to its original URL if necessary. */
- if (original_ra_url)
- {
- SVN_ERR(svn_ra_reparent(wb->ra_session,
- original_ra_url, pool));
- }
- } /* the slightly harder way */
- }
/* Regardless of whether PATH has explicit mergeinfo or not, we must
determine if PATH is switched. This is so get_mergeinfo_paths()
can later tweak PATH's parent to reflect a missing child (implying it
@@ -5021,7 +4917,7 @@ get_mergeinfo_walk_cb(const char *path,
depth is immediates, and/or are file children of the merge target if
depth is files. */
if (path_is_merge_target
- || has_mergeinfo_from_merge_src
+ || has_mergeinfo
|| entry->schedule == svn_wc_schedule_delete
|| switched
|| entry->depth == svn_depth_empty
@@ -5263,9 +5159,7 @@ insert_parent_and_sibs_of_sw_absent_del_
Create an svn_client__merge_path_t * for any path which meets one or more
of the following criteria:
- 1) do_directory_merge() is processing a forward merge and path has
- working svn:mergeinfo from corresponding merge source or has empty
- mergeinfo.
+ 1) Path has working svn:mergeinfo.
2) Path is switched.
3) Path is a subtree of the merge target (i.e. is not equal to
MERGE_CMD_BATON->TARGET) and has no mergeinfo of its own but its
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_base/bdb/env.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_base/bdb/env.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_base/bdb/env.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_base/bdb/env.c Thu Jun 17 19:00:01 2010
@@ -369,7 +369,7 @@ clear_cache(void *data)
static volatile svn_atomic_t bdb_cache_state;
static svn_error_t *
-bdb_init_cb(apr_pool_t *pool)
+bdb_init_cb(void *baton, apr_pool_t *pool)
{
#if APR_HAS_THREADS
apr_status_t apr_err;
@@ -396,7 +396,7 @@ bdb_init_cb(apr_pool_t *pool)
svn_error_t *
svn_fs_bdb__init(apr_pool_t* pool)
{
- return svn_atomic__init_once(&bdb_cache_state, bdb_init_cb, pool);
+ return svn_atomic__init_once(&bdb_cache_state, bdb_init_cb, NULL, pool);
}
static APR_INLINE void
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs.h?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs.h Thu Jun 17 19:00:01 2010
@@ -25,6 +25,7 @@
#include "svn_fs.h"
#include "svn_config.h"
+#include "private/svn_atomic.h"
#include "private/svn_cache.h"
#include "private/svn_fs_private.h"
#include "private/svn_sqlite.h"
@@ -233,8 +234,15 @@ typedef struct
/* The sqlite database used for rep caching. */
svn_sqlite__db_t *rep_cache_db;
+ /* Thread-safe boolean */
+ svn_atomic_t rep_cache_db_opened;
+
/* The oldest revision not in a pack file. */
svn_revnum_t min_unpacked_rev;
+
+ /* Whether rep-sharing is supported by the filesystem
+ * and allowed by the configuration. */
+ svn_boolean_t rep_sharing_allowed;
} fs_fs_data_t;
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs_fs.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/fs_fs.c Thu Jun 17 19:00:01 2010
@@ -1058,6 +1058,27 @@ svn_fs_fs__fs_supports_mergeinfo(svn_fs_
}
static svn_error_t *
+read_config(svn_fs_t *fs,
+ apr_pool_t *pool)
+{
+ fs_fs_data_t *ffd = fs->fsap_data;
+
+ SVN_ERR(svn_config_read(&ffd->config,
+ svn_path_join(fs->path, PATH_CONFIG, pool),
+ FALSE, fs->pool));
+
+ /* Initialize ffd->rep_sharing_allowed. */
+ if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+ SVN_ERR(svn_config_get_bool(ffd->config, &ffd->rep_sharing_allowed,
+ CONFIG_SECTION_REP_SHARING,
+ CONFIG_OPTION_ENABLE_REP_SHARING, TRUE));
+ else
+ ffd->rep_sharing_allowed = FALSE;
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
write_config(svn_fs_t *fs,
apr_pool_t *pool)
{
@@ -1147,7 +1168,6 @@ svn_fs_fs__open(svn_fs_t *fs, const char
int format, max_files_per_dir;
char buf[APR_UUID_FORMATTED_LENGTH + 2];
apr_size_t limit;
- svn_boolean_t rep_sharing_allowed;
fs->path = apr_pstrdup(fs->pool, path);
@@ -1175,17 +1195,7 @@ svn_fs_fs__open(svn_fs_t *fs, const char
SVN_ERR(update_min_unpacked_rev(fs, pool));
/* Read the configuration file. */
- SVN_ERR(svn_config_read(&ffd->config,
- svn_path_join(fs->path, PATH_CONFIG, pool),
- FALSE, fs->pool));
- SVN_ERR(svn_config_get_bool(ffd->config, &rep_sharing_allowed,
- CONFIG_SECTION_REP_SHARING,
- CONFIG_OPTION_ENABLE_REP_SHARING, TRUE));
-
- /* Open the rep cache. */
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT
- && rep_sharing_allowed)
- SVN_ERR(svn_fs_fs__open_rep_cache(fs, fs->pool));
+ SVN_ERR(read_config(fs, pool));
return get_youngest(&(ffd->youngest_rev_cache), path, pool);
}
@@ -5028,7 +5038,8 @@ rep_write_contents_close(void *baton)
/* Check and see if we already have a representation somewhere that's
identical to the one we just wrote out. */
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+ if (ffd->rep_sharing_allowed)
+ /* ### TODO: ignore errors opening the DB (issue #3506) * */
SVN_ERR(svn_fs_fs__get_rep_reference(&old_rep, b->fs, rep->sha1_checksum,
b->parent_pool));
else
@@ -5275,6 +5286,8 @@ write_final_rev(const svn_fs_id_t **new_
const svn_fs_id_t *id,
const char *start_node_id,
const char *start_copy_id,
+ apr_array_header_t *reps_to_cache,
+ apr_pool_t *reps_pool,
apr_pool_t *pool)
{
node_revision_t *noderev;
@@ -5313,6 +5326,7 @@ write_final_rev(const svn_fs_id_t **new_
dirent = val;
SVN_ERR(write_final_rev(&new_id, file, rev, fs, dirent->id,
start_node_id, start_copy_id,
+ reps_to_cache, reps_pool,
subpool));
if (new_id && (svn_fs_fs__id_rev(new_id) == rev))
dirent->id = svn_fs_fs__id_copy(new_id, pool);
@@ -5408,10 +5422,14 @@ write_final_rev(const svn_fs_id_t **new_
pool));
/* Save the data representation's hash in the rep cache. */
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT
+ if (ffd->rep_sharing_allowed
&& noderev->data_rep && noderev->kind == svn_node_file
&& noderev->data_rep->revision == rev)
- SVN_ERR(svn_fs_fs__set_rep_reference(fs, noderev->data_rep, FALSE, pool));
+ {
+ SVN_ERR_ASSERT(reps_to_cache && reps_pool);
+ APR_ARRAY_PUSH(reps_to_cache, representation_t *)
+ = svn_fs_fs__rep_copy(noderev->data_rep, reps_pool);
+ }
/* Return our ID that references the revision file. */
*new_id_p = noderev->id;
@@ -5652,6 +5670,8 @@ struct commit_baton {
svn_revnum_t *new_rev_p;
svn_fs_t *fs;
svn_fs_txn_t *txn;
+ apr_array_header_t *reps_to_cache;
+ apr_pool_t *reps_pool;
};
/* The work-horse for svn_fs_fs__commit, called with the FS write lock.
@@ -5705,6 +5725,7 @@ commit_body(void *baton, apr_pool_t *poo
root_id = svn_fs_fs__id_txn_create("0", "0", cb->txn->id, pool);
SVN_ERR(write_final_rev(&new_root_id, proto_file, new_rev, cb->fs, root_id,
start_node_id, start_copy_id,
+ cb->reps_to_cache, cb->reps_pool,
pool));
/* Write the changed-path information. */
@@ -5826,28 +5847,42 @@ struct commit_sqlite_txn_baton
apr_pool_t *pool;
};
-/* Implements svn_sqlite__transaction_callback_t. */
+/* Add the representations in REPS_TO_CACHE (an array of representation_t *)
+ * to the rep-cache database of FS. */
static svn_error_t *
-commit_sqlite_txn_callback(void *baton, svn_sqlite__db_t *db)
+write_reps_to_cache(svn_fs_t *fs,
+ apr_array_header_t *reps_to_cache,
+ apr_pool_t *scratch_pool)
{
- struct commit_sqlite_txn_baton *cstb = baton;
- return commit_body(cstb->cb, cstb->pool);
+ int i;
+
+ for (i = 0; i < reps_to_cache->nelts; i++)
+ {
+ representation_t *rep = APR_ARRAY_IDX(reps_to_cache, i, representation_t *);
+
+ /* FALSE because we don't care if another parallel commit happened to
+ * collide with us. (Non-parallel collisions will not be detected.) */
+ SVN_ERR(svn_fs_fs__set_rep_reference(fs, rep, FALSE, scratch_pool));
+ }
+
+ return SVN_NO_ERROR;
}
-/* Wrapper around commit_body() which implements SQLite transactions. Arguments
- the same as commit_body(). */
+/* Implements svn_sqlite__transaction_callback_t. */
static svn_error_t *
-commit_body_rep_cache(void *baton, apr_pool_t *pool)
+commit_sqlite_txn_callback(void *baton, svn_sqlite__db_t *db)
{
- struct commit_sqlite_txn_baton cstb;
- struct commit_baton *cb = baton;
- fs_fs_data_t *ffd = cb->fs->fsap_data;
+ struct commit_sqlite_txn_baton *cstb = baton;
+ struct commit_baton *cb = cstb->cb;
- cstb.cb = cb;
- cstb.pool = pool;
+ /* Write new entries to the rep-sharing database.
+ *
+ * We use an sqlite transcation to speed things up;
+ * see <http://www.sqlite.org/faq.html#q19>.
+ */
+ SVN_ERR(write_reps_to_cache(cb->fs, cb->reps_to_cache, cstb->pool));
- return svn_sqlite__with_transaction(ffd->rep_cache_db,
- commit_sqlite_txn_callback, &cstb);
+ return SVN_NO_ERROR;
}
svn_error_t *
@@ -5862,10 +5897,34 @@ svn_fs_fs__commit(svn_revnum_t *new_rev_
cb.new_rev_p = new_rev_p;
cb.fs = fs;
cb.txn = txn;
- return svn_fs_fs__with_write_lock(fs,
- ffd->rep_cache_db ? commit_body_rep_cache :
- commit_body,
- &cb, pool);
+
+ if (ffd->rep_sharing_allowed)
+ {
+ cb.reps_to_cache = apr_array_make(pool, 5, sizeof(representation_t *));
+ cb.reps_pool = pool;
+ }
+ else
+ {
+ cb.reps_to_cache = NULL;
+ cb.reps_pool = NULL;
+ }
+
+ SVN_ERR(svn_fs_fs__with_write_lock(fs, commit_body, &cb, pool));
+
+ if (ffd->rep_sharing_allowed)
+ {
+ struct commit_sqlite_txn_baton cstb;
+ cstb.cb = &cb;
+ cstb.pool = pool;
+
+ /* ### TODO: ignore errors opening the DB (issue #3506) * */
+ SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
+ SVN_ERR(svn_sqlite__with_transaction(ffd->rep_cache_db,
+ commit_sqlite_txn_callback,
+ &cstb));
+ }
+
+ return SVN_NO_ERROR;
}
svn_error_t *
@@ -5926,7 +5985,6 @@ svn_fs_fs__create(svn_fs_t *fs,
{
int format = SVN_FS_FS__FORMAT_NUMBER;
fs_fs_data_t *ffd = fs->fsap_data;
- svn_boolean_t rep_sharing_allowed;
fs->path = apr_pstrdup(pool, path);
/* See if we had an explicitly requested pre-1.4- or pre-1.5-compatible. */
@@ -5986,17 +6044,7 @@ svn_fs_fs__create(svn_fs_t *fs,
SVN_ERR(write_config(fs, pool));
/* Read the configuration file. */
- SVN_ERR(svn_config_read(&ffd->config,
- svn_path_join(fs->path, PATH_CONFIG, pool),
- FALSE, fs->pool));
- SVN_ERR(svn_config_get_bool(ffd->config, &rep_sharing_allowed,
- CONFIG_SECTION_REP_SHARING,
- CONFIG_OPTION_ENABLE_REP_SHARING, TRUE));
-
- /* Create the rep cache. */
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT
- && rep_sharing_allowed)
- SVN_ERR(svn_fs_fs__open_rep_cache(fs, fs->pool));
+ SVN_ERR(read_config(fs, pool));
/* Create the min unpacked rev file. */
if (ffd->format >= SVN_FS_FS__MIN_PACKED_FORMAT)
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.c Thu Jun 17 19:00:01 2010
@@ -54,13 +54,18 @@ static const char * const statements[] =
};
-svn_error_t *
-svn_fs_fs__open_rep_cache(svn_fs_t *fs,
- apr_pool_t *pool)
+static svn_error_t *
+open_rep_cache(void *baton,
+ apr_pool_t *pool)
{
+ svn_fs_t *fs = baton;
fs_fs_data_t *ffd = fs->fsap_data;
const char *db_path;
+ /* Be idempotent. */
+ if (ffd->rep_cache_db)
+ return SVN_NO_ERROR;
+
/* Open (or create) the sqlite database. It will be automatically
closed when fs->pool is destoyed. */
db_path = svn_path_join(fs->path, REP_CACHE_DB_NAME, pool);
@@ -73,6 +78,15 @@ svn_fs_fs__open_rep_cache(svn_fs_t *fs,
}
svn_error_t *
+svn_fs_fs__open_rep_cache(svn_fs_t *fs,
+ apr_pool_t *pool)
+{
+ fs_fs_data_t *ffd = fs->fsap_data;
+ return svn_atomic__init_once(&ffd->rep_cache_db_opened,
+ open_rep_cache, fs, pool);
+}
+
+svn_error_t *
svn_fs_fs__get_rep_reference(representation_t **rep,
svn_fs_t *fs,
svn_checksum_t *checksum,
@@ -82,11 +96,9 @@ svn_fs_fs__get_rep_reference(representat
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
- if (ffd->rep_cache_db == NULL)
- {
- *rep = NULL;
- return SVN_NO_ERROR;
- }
+ SVN_ERR_ASSERT(ffd->rep_sharing_allowed);
+ if (! ffd->rep_cache_db)
+ SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
/* We only allow SHA1 checksums in this table. */
if (checksum->kind != svn_checksum_sha1)
@@ -124,8 +136,9 @@ svn_fs_fs__set_rep_reference(svn_fs_t *f
representation_t *old_rep;
svn_sqlite__stmt_t *stmt;
- if (ffd->rep_cache_db == NULL)
- return SVN_NO_ERROR;
+ SVN_ERR_ASSERT(ffd->rep_sharing_allowed);
+ if (! ffd->rep_cache_db)
+ SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
/* We only allow SHA1 checksums in this table. */
if (rep->sha1_checksum == NULL)
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.h?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.h (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_fs_fs/rep-cache.h Thu Jun 17 19:00:01 2010
@@ -29,7 +29,7 @@ extern "C" {
#define REP_CACHE_DB_NAME "rep-cache.db"
-/* Open (and create, if needed) the rep cache database associated with FS.
+/* Open and create, if needed, the rep cache database associated with FS.
Use POOL for temporary allocations. */
svn_error_t *
svn_fs_fs__open_rep_cache(svn_fs_t *fs,
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_neon/session.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_neon/session.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_neon/session.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_neon/session.c Thu Jun 17 19:00:01 2010
@@ -724,7 +724,7 @@ parse_url(ne_uri *uri, const char *url)
/* Initializer function matching the prototype accepted by
svn_atomic__init_once(). */
static svn_error_t *
-initialize_neon(apr_pool_t *ignored_pool)
+initialize_neon(void *baton, apr_pool_t *ignored_pool)
{
if (ne_sock_init() != 0)
return svn_error_create(SVN_ERR_RA_DAV_SOCK_INIT, NULL,
@@ -737,7 +737,7 @@ initialize_neon(apr_pool_t *ignored_pool
static svn_error_t *
ensure_neon_initialized(void)
{
- return svn_atomic__init_once(&neon_initialized, initialize_neon, NULL);
+ return svn_atomic__init_once(&neon_initialized, initialize_neon, NULL, NULL);
}
static svn_error_t *
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_serf/win32_auth_sspi.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_serf/win32_auth_sspi.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_serf/win32_auth_sspi.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_serf/win32_auth_sspi.c Thu Jun 17 19:00:01 2010
@@ -76,7 +76,7 @@ static unsigned int ntlm_maxtokensize =
* Accepted by svn_atomic__init_once()
*/
static svn_error_t *
-initialize_sspi(apr_pool_t* pool)
+initialize_sspi(void *baton, apr_pool_t* pool)
{
sspi = InitSecurityInterface();
@@ -118,7 +118,8 @@ init_sspi_connection(svn_ra_serf__sessio
const char *tmp;
apr_size_t tmp_len;
- SVN_ERR(svn_atomic__init_once(&sspi_initialized, initialize_sspi, pool));
+ SVN_ERR(svn_atomic__init_once(&sspi_initialized,
+ initialize_sspi, NULL, pool));
conn->sspi_context = (serf_sspi_context_t*)
apr_palloc(pool, sizeof(serf_sspi_context_t));
@@ -300,7 +301,8 @@ init_proxy_sspi_connection(svn_ra_serf__
const char *tmp;
apr_size_t tmp_len;
- SVN_ERR(svn_atomic__init_once(&sspi_initialized, initialize_sspi, pool));
+ SVN_ERR(svn_atomic__init_once(&sspi_initialized,
+ initialize_sspi, NULL, pool));
conn->proxy_sspi_context = (serf_sspi_context_t*)
apr_palloc(pool, sizeof(serf_sspi_context_t));
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_svn/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_svn/cyrus_auth.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_ra_svn/cyrus_auth.c Thu Jun 17 19:00:01 2010
@@ -163,7 +163,7 @@ apr_status_t svn_ra_svn__sasl_common_ini
return apr_err;
}
-static svn_error_t *sasl_init_cb(apr_pool_t *pool)
+static svn_error_t *sasl_init_cb(void *baton, apr_pool_t *pool)
{
if (svn_ra_svn__sasl_common_init(pool) != APR_SUCCESS
|| sasl_client_init(NULL) != SASL_OK)
@@ -174,7 +174,8 @@ static svn_error_t *sasl_init_cb(apr_poo
svn_error_t *svn_ra_svn__sasl_init(void)
{
- SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status, sasl_init_cb, NULL));
+ SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status,
+ sasl_init_cb, NULL, NULL));
return SVN_NO_ERROR;
}
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/atomic.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/atomic.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/atomic.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/atomic.c Thu Jun 17 19:00:01 2010
@@ -26,7 +26,9 @@
svn_error_t*
svn_atomic__init_once(volatile svn_atomic_t *global_status,
- svn_error_t *(*init_func)(apr_pool_t*), apr_pool_t* pool)
+ svn_error_t *(*init_func)(void*,apr_pool_t*),
+ void *baton,
+ apr_pool_t* pool)
{
/* !! Don't use localizable strings in this function, because these
!! might cause deadlocks. This function can be used to initialize
@@ -41,7 +43,7 @@ svn_atomic__init_once(volatile svn_atomi
if (status == SVN_ATOMIC_UNINITIALIZED)
{
- svn_error_t *err = init_func(pool);
+ svn_error_t *err = init_func(baton, pool);
if (err)
{
#if APR_HAS_THREADS
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/sqlite.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_subr/sqlite.c Thu Jun 17 19:00:01 2010
@@ -484,7 +484,7 @@ static volatile svn_atomic_t sqlite_init
manner. */
/* Don't call this function directly! Use svn_atomic__init_once(). */
static svn_error_t *
-init_sqlite(apr_pool_t *pool)
+init_sqlite(void *baton, apr_pool_t *pool)
{
if (sqlite3_libversion_number() < SQLITE_VERSION_NUMBER) {
return svn_error_createf(SVN_ERR_SQLITE_ERROR, NULL,
@@ -526,7 +526,8 @@ svn_sqlite__get_schema_version(int *vers
{
svn_sqlite__db_t db;
- SVN_ERR(svn_atomic__init_once(&sqlite_init_state, init_sqlite, scratch_pool));
+ SVN_ERR(svn_atomic__init_once(&sqlite_init_state,
+ init_sqlite, NULL, scratch_pool));
SQLITE_ERR(sqlite3_open(path, &db.db3), &db);
SVN_ERR(get_schema(version, &db, scratch_pool));
SQLITE_ERR(sqlite3_close(db.db3), &db);
@@ -574,7 +575,8 @@ svn_sqlite__open(svn_sqlite__db_t **db,
int latest_schema, const char * const *upgrade_sql,
apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
- SVN_ERR(svn_atomic__init_once(&sqlite_init_state, init_sqlite, scratch_pool));
+ SVN_ERR(svn_atomic__init_once(&sqlite_init_state,
+ init_sqlite, NULL, scratch_pool));
*db = apr_palloc(result_pool, sizeof(**db));
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/svnserve/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/svnserve/cyrus_auth.c?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/svnserve/cyrus_auth.c Thu Jun 17 19:00:01 2010
@@ -97,7 +97,7 @@ static sasl_callback_t callbacks[] =
{ SASL_CB_LIST_END, NULL, NULL }
};
-static svn_error_t *initialize(apr_pool_t *pool)
+static svn_error_t *initialize(void *baton, apr_pool_t *pool)
{
int result;
apr_status_t status;
@@ -122,7 +122,8 @@ static svn_error_t *initialize(apr_pool_
svn_error_t *cyrus_init(apr_pool_t *pool)
{
- SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status, initialize, pool));
+ SVN_ERR(svn_atomic__init_once(&svn_ra_svn__sasl_status,
+ initialize, NULL, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py?rev=955709&r1=955708&r2=955709&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py Thu Jun 17 19:00:01 2010
@@ -5320,7 +5320,8 @@ def merge_to_target_with_copied_children
'pi' : Item("This is the file 'pi'.\n"),
'rho' : Item("New content"),
'rho_copy' : Item("New content",
- props={SVN_PROP_MERGEINFO : '/A/D/G/rho:4'}),
+ props={SVN_PROP_MERGEINFO :
+ '/A/D/G/rho:4\n/A/D/G/rho_copy:4-5'}),
'tau' : Item("This is the file 'tau'.\n"),
})
expected_skip = wc.State(G_COPY_path, { })
@@ -16397,6 +16398,194 @@ 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.
+ #
+ # 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 +16809,7 @@ test_list = [ None,
SkipUnless(handle_gaps_in_implicit_mergeinfo,
server_has_mergeinfo),
reintegrate_with_self_referential_mergeinfo,
+ added_subtrees_with_mergeinfo_break_reintegrate,
]
if __name__ == '__main__':
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 17 19:00:01 2010
@@ -0,0 +1,85 @@
+/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/merge_tests.py:870312
+/subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py:954549-955706
+/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-issue3303/subversion/tests/cmdline/merge_tests.py:950948-955336
+/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-issue3506/subversion/tests/cmdline/merge_tests.py:934622-955678
+/subversion/branches/1.6.x-issue3506-init_once/subversion/tests/cmdline/merge_tests.py:935083-955686
+/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-issue3651/subversion/tests/cmdline/merge_tests.py:952977-954985
+/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py:953882-955338
+/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-r935631/subversion/tests/cmdline/merge_tests.py:952683-955333
+/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/subtree-mergeinfo/subversion/tests/cmdline/merge_tests.py:876855
+/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,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,950931,950933,951753,952992,953317