Author: cmpilato
Date: Wed Apr 7 00:45:47 2010
New Revision: 931384
URL: http://svn.apache.org/viewvc?rev=931384&view=rev
Log:
On the '1.6.x-3242-partial-fixes' branch, merged from trunk r931209
and r931211 (performing conflict resolution as necessary).
Modified:
subversion/branches/1.6.x-3242-partial-fixes/ (props changed)
subversion/branches/1.6.x-3242-partial-fixes/CHANGES (props changed)
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_client/mergeinfo.c
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_ra/ra_loader.c
Propchange: subversion/branches/1.6.x-3242-partial-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 7 00:45:47 2010
@@ -68,4 +68,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,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,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,87757
3,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879954,879961,880082,
880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,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,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,87757
3,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879954,879961,880082,
880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211
Propchange: subversion/branches/1.6.x-3242-partial-fixes/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 7 00:45:47 2010
@@ -67,4 +67,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-929658
+/subversion/trunk/CHANGES:837701-841355,875962-929658,931209,931211
Modified:
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_client/mergeinfo.c?rev=931384&r1=931383&r2=931384&view=diff
==============================================================================
---
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_client/mergeinfo.c
(original)
+++
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_client/mergeinfo.c
Wed Apr 7 00:45:47 2010
@@ -861,19 +861,14 @@ get_mergeinfo(svn_mergeinfo_t *mergeinfo
if (svn_path_is_url(path_or_url))
{
- const char *repos_rel_path;
-
SVN_ERR(svn_client__open_ra_session_internal(&ra_session, path_or_url,
NULL, NULL, NULL, FALSE,
TRUE, ctx, subpool));
SVN_ERR(svn_client__get_revision_number(&rev, NULL, ra_session,
peg_revision, "", subpool));
SVN_ERR(svn_ra_get_repos_root2(ra_session, repos_root, pool));
- SVN_ERR(svn_client__path_relative_to_root(&repos_rel_path, path_or_url,
- *repos_root, FALSE, NULL,
- NULL, subpool));
SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, mergeinfo,
- repos_rel_path, rev,
+ "", rev,
svn_mergeinfo_inherited, FALSE,
pool));
}
Modified:
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_ra/ra_loader.c?rev=931384&r1=931383&r2=931384&view=diff
==============================================================================
---
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_ra/ra_loader.c
(original)
+++
subversion/branches/1.6.x-3242-partial-fixes/subversion/libsvn_ra/ra_loader.c
Wed Apr 7 00:45:47 2010
@@ -634,6 +634,8 @@ svn_error_t *svn_ra_get_mergeinfo(svn_ra
{
svn_error_t *err;
int i;
+ apr_hash_index_t *hi;
+ svn_mergeinfo_catalog_t tmp_catalog;
/* Validate path format. */
for (i = 0; i < paths->nelts; i++)
@@ -650,9 +652,40 @@ svn_error_t *svn_ra_get_mergeinfo(svn_ra
return err;
}
- return session->vtable->get_mergeinfo(session, catalog, paths,
- revision, inherit,
- include_descendants, pool);
+ SVN_ERR(session->vtable->get_mergeinfo(session, &tmp_catalog, paths,
+ revision, inherit,
+ include_descendants, pool));
+
+ if (tmp_catalog == NULL)
+ {
+ *catalog = NULL;
+ return SVN_NO_ERROR;
+ }
+
+ /* Work around a bug in pre-1.7 servers that caused CATALOG's keys
+ to be a mix of absolute and relative paths (when they were all
+ supposed to be relative. */
+ *catalog = apr_hash_make(pool);
+ for (hi = apr_hash_first(pool, tmp_catalog); hi; hi = apr_hash_next(hi))
+ {
+ const void *key;
+ apr_ssize_t klen;
+ void *val;
+ const char *path;
+
+ apr_hash_this(hi, &key, &klen, &val);
+ path = key;
+ if (path[0] == '/')
+ {
+ apr_hash_set(*catalog, path + 1, klen - 1, val);
+ }
+ else
+ {
+ apr_hash_set(*catalog, path, klen, val);
+ }
+ }
+
+ return SVN_NO_ERROR;
}
svn_error_t *svn_ra_do_update2(svn_ra_session_t *session,
