Author: hwright
Date: Thu Jun 17 17:54:19 2010
New Revision: 955687
URL: http://svn.apache.org/viewvc?rev=955687&view=rev
Log:
Reintegrate the 1.6.x-issue3506-init_once branch:
* 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, hwright, philip
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/include/private/svn_atomic.h
subversion/branches/1.6.x/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs.h
subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/1.6.x/subversion/libsvn_ra_neon/session.c
subversion/branches/1.6.x/subversion/libsvn_ra_serf/win32_auth_sspi.c
subversion/branches/1.6.x/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c
subversion/branches/1.6.x/subversion/libsvn_subr/sqlite.c
subversion/branches/1.6.x/subversion/svnserve/cyrus_auth.c
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (props
changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 17:54:19 2010
@@ -11,6 +11,7 @@
/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
@@ -79,4 +80,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,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,935631,935992,935996,937610,944635,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,950931,950933,951753,952992,953317
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 17:54:19 2010
@@ -11,6 +11,7 @@
/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
@@ -78,4 +79,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,950931,950933,951753,952992,953317
+/subversion/trunk/CHANGES:837701-841355,875962-934485,934599,934603,935631,935992,935996,937610,944635,950931,950933,951753,952992,953317
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Jun 17 17:54:19 2010
@@ -199,21 +199,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * 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, hwright, philip
Modified: subversion/branches/1.6.x/subversion/include/private/svn_atomic.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/include/private/svn_atomic.h?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/include/private/svn_atomic.h (original)
+++ subversion/branches/1.6.x/subversion/include/private/svn_atomic.h Thu Jun
17 17:54:19 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/subversion/libsvn_fs_base/bdb/env.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_base/bdb/env.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_base/bdb/env.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_base/bdb/env.c Thu Jun 17
17:54:19 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/subversion/libsvn_fs_fs/fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs.h?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs.h Thu Jun 17 17:54:19
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,6 +234,9 @@ 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;
Modified: subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c Thu Jun 17
17:54:19 2010
@@ -54,10 +54,11 @@ 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;
@@ -77,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,
Modified: subversion/branches/1.6.x/subversion/libsvn_ra_neon/session.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_ra_neon/session.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_ra_neon/session.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_ra_neon/session.c Thu Jun 17
17:54:19 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/subversion/libsvn_ra_serf/win32_auth_sspi.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_ra_serf/win32_auth_sspi.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_ra_serf/win32_auth_sspi.c
(original)
+++ subversion/branches/1.6.x/subversion/libsvn_ra_serf/win32_auth_sspi.c Thu
Jun 17 17:54:19 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/subversion/libsvn_ra_svn/cyrus_auth.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_ra_svn/cyrus_auth.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_ra_svn/cyrus_auth.c Thu Jun 17
17:54:19 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/subversion/libsvn_subr/atomic.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_subr/atomic.c Thu Jun 17
17:54:19 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/subversion/libsvn_subr/sqlite.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_subr/sqlite.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_subr/sqlite.c Thu Jun 17
17:54:19 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/subversion/svnserve/cyrus_auth.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/svnserve/cyrus_auth.c?rev=955687&r1=955686&r2=955687&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/branches/1.6.x/subversion/svnserve/cyrus_auth.c Thu Jun 17
17:54:19 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;
}
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 17:54:19 2010
@@ -10,6 +10,7 @@
/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
