You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/12/19 16:53:07 UTC
svn commit: r1220809 - in /subversion/branches/1.7.x-r1210147: ./
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/libsvn_wc/
subversion/po/ subversion/svnserve/ subversion/tests/cmdline/...
Author: julianfoad
Date: Mon Dec 19 15:53:06 2011
New Revision: 1220809
URL: http://svn.apache.org/viewvc?rev=1220809&view=rev
Log:
On the '1.7.x-r1210147' branch: Catch up with 1.7.x@1220807.
Modified:
subversion/branches/1.7.x-r1210147/ (props changed)
subversion/branches/1.7.x-r1210147/CHANGES (props changed)
subversion/branches/1.7.x-r1210147/STATUS
subversion/branches/1.7.x-r1210147/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/1.7.x-r1210147/subversion/include/private/svn_string_private.h (props changed)
subversion/branches/1.7.x-r1210147/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_client/add.c
subversion/branches/1.7.x-r1210147/subversion/libsvn_client/delete.c
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/hash.c (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/workqueue.c
subversion/branches/1.7.x-r1210147/subversion/po/de.po
subversion/branches/1.7.x-r1210147/subversion/svnserve/serve.c
subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py (contents, props changed)
subversion/branches/1.7.x-r1210147/tools/client-side/svnmucc/svnmucc.c
Propchange: subversion/branches/1.7.x-r1210147/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x:1213306-1220807
/subversion/branches/1.7.x-JavaHL-pools:1158684-1158722
/subversion/branches/1.7.x-issue3888:1148937-1149162
/subversion/branches/1.7.x-issue3975:1160761-1161546
@@ -15,6 +16,7 @@
/subversion/branches/1.7.x-r1173425:1173429-1176454
/subversion/branches/1.7.x-r1180154:1186224-1186351
/subversion/branches/1.7.x-r1201824:1202121-1207333
+/subversion/branches/1.7.x-r1213331:1213684-1213756
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
@@ -69,4 +71,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533,1210147
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533,1207858,1207949,1210147,1210195,1211483,1211859,1211885,1213331,1213673,1213681,1213690,1213711,1213716,1214139
Propchange: subversion/branches/1.7.x-r1210147/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x/CHANGES:1213306-1220745
/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
@@ -59,4 +60,4 @@
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
/subversion/branches/uris-as-urls/CHANGES:1060426-1064427
-/subversion/trunk/CHANGES:1145993-1200899,1204598-1207934
+/subversion/trunk/CHANGES:1145993-1200899,1204598-1207934,1207949,1210195,1211483,1211859,1211885
Modified: subversion/branches/1.7.x-r1210147/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/STATUS?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/STATUS (original)
+++ subversion/branches/1.7.x-r1210147/STATUS Mon Dec 19 15:53:06 2011
@@ -75,42 +75,28 @@ Candidate changes:
Votes:
+1: stsp, philip
- * r1207858, r1207949
- Replace two assertions that say that your working copy is broken with
- error messages that supply a bit more information about what is broken.
- Votes:
- +1: philip, rhuijben
-
- * r1210195
- Canonicalize svnserve.conf input.
+ * r1220783
+ Fix mis-ordered text output of 'svn log --diff' on Windows.
Justification:
- Server asserts after being upgraded.
+ Badness within 'svn', fixed within 'svn'. Needed for r1210147 group.
Votes:
- +1: danielsh, philip
+ +1: julianfoad
- * r1210147
+ * r1210147, r1202132, r1202333, r1220740
Fix the 'svn log --diff' code so that it correctly shows a diff of a
target file (or directory) that was at a different path in the past.
Previously it would error out. A test is included.
+ Branch:
+ ^/subversion/branches/1.7.x-r1210147
+ Notes:
+ Depends on the r1220783 bug fix, otherwise the test will fail on Windows.
+ r1210147 is the actual fix.
+ r1202132 and r1202333 were merged for conflict resolution. These revisions
+ depend on the issue #2873 fix which has been backported in 1.7.2
+ r1220740 expands the test so that it would fail without r1210147 applied.
Votes:
+ +1: stsp (without r1220740)
+1: julianfoad
- +0: stsp (change is good, but this needs a backport branch because
- svn_client_diff_peg6 is new in 1.8)
-
- * r1211483
- Don't segfault on 'svn mkdir svn://localhost'
- Justification:
- Thou shall not segfault.
- Votes:
- +1: rhuijben, philip
-
- * r1211859, r1211885
- Fix issue 4074, SEGV on "svn rm ROOT_URL"
- Justification:
- It's a SEGV.
- Votes:
- +1: philip, rhuijben, steveking
-
* r1154121, r1195480, r1208840, r1209631, r1209654, r1212476, r1212482,
r1212484
@@ -122,7 +108,43 @@ Candidate changes:
Notes:
Merge with --accept=theirs-conflict
Votes:
- +1: stsp
+ +1: stsp, philip
+
+ * r1215260, r1215288, r1215374, r1215375, r1215379
+ Fix issue #4082 ("'svn log --with-all-revprops' over ra-dav
+ intolerant of XML-unsafe property values").
+ Justification:
+ 'Tis better to succeed than to fail. Unless of course you're
+ talking about successfully doing evil, in which case 'tis better
+ to fail. But we're not talking about doing evil here. Unless
+ you think XML is evil. But seriously, these commits introduce a
+ protocol change for WebDAV. I suspect that might disqualify it
+ in some folks' eyes from backport to a patch release rather
+ automatically. But the protocol change is (as all our other
+ protocol changes are) designed to maintain compatibility across
+ client and server versions. If the client advertises support for
+ the new behavior, and the server has such support, the bugfix
+ logic is activitated. A patched client will not trouble an
+ unpatched server; nor vice-versa. Further, the effects of the
+ corrected behavior do not persist, so there's no dataset damage
+ imposed for users who would roll this change back out of their
+ systems (by reverting to a prior release). Therefore, cmpilato
+ can't think of a good reason not to backport the change.
+ Notes:
+ r1215260 - mod_dav_svn support for this issue
+ r1215288 - libsvn_ra_neon support for this issue
+ r1215374 - followup to r1215288
+ r1215375 - libsvn_ra_serf support for this issue
+ r1215379 - followup to r1215375
+ Votes:
+ +1: cmpilato
+
+ * r1220742, r1220750
+ Fix spurious testsuite FAIL
+ Justification:
+ We don't expect users to ignore tests that FAIL.
+ Votes:
+ +1: philip, rhuijben
Veto-blocked changes:
=====================
Propchange: subversion/branches/1.7.x-r1210147/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/subversion/libsvn_diff/diff.h:870312
+/subversion/branches/1.7.x/subversion/include/private/svn_adler32.h:1213306-1220745
/subversion/branches/atomic-revprop/subversion/libsvn_diff/diff.h:965046-1000689
/subversion/branches/bdb-reverse-deltas/subversion/libsvn_diff/diff.h:872050-872529
/subversion/branches/diff-callbacks3/subversion/libsvn_diff/diff.h:870059-870761
@@ -44,4 +45,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_adler32.h:1189190,1189395
+/subversion/trunk/subversion/include/private/svn_adler32.h:1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/subversion/include/svn_string.h:870312
+/subversion/branches/1.7.x/subversion/include/private/svn_string_private.h:1213306-1220745
/subversion/branches/atomic-revprop/subversion/include/svn_string.h:965046-1000689
/subversion/branches/bdb-reverse-deltas/subversion/include/svn_string.h:872050-872529
/subversion/branches/diff-callbacks3/subversion/include/svn_string.h:870059-870761
@@ -53,4 +54,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
-/subversion/trunk/subversion/include/private/svn_string_private.h:1149240,1189190,1189395
+/subversion/trunk/subversion/include/private/svn_string_private.h:1149240,1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,2 +1,3 @@
+/subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h:1213306-1220745
/subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_client/add.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_client/add.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_client/add.c Mon Dec 19 15:53:06 2011
@@ -819,6 +819,11 @@ mkdir_urls(const apr_array_header_t *url
const char *bname;
svn_uri_split(&common, &bname, common, pool);
APR_ARRAY_PUSH(targets, const char *) = bname;
+
+ if (*bname == '\0')
+ return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("There is no valid uri above '%s'"),
+ common);
}
else
{
@@ -841,6 +846,12 @@ mkdir_urls(const apr_array_header_t *url
const char *bname;
svn_uri_split(&common, &bname, common, pool);
+
+ if (*bname == '\0')
+ return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("There is no valid uri above '%s'"),
+ common);
+
for (i = 0; i < targets->nelts; i++)
{
const char *path = APR_ARRAY_IDX(targets, i, const char *);
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_client/delete.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_client/delete.c Mon Dec 19 15:53:06 2011
@@ -272,6 +272,12 @@ delete_urls_multi_repos(const apr_array_
APR_ARRAY_PUSH(relpaths_list, const char *) = repos_relpath;
}
+ /* Check we identified a non-root relpath. Return an RA error
+ code for 1.6 compatibility. */
+ if (!repos_relpath || !*repos_relpath)
+ return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
+ "URL '%s' not within a repository", uri);
+
/* Now, test to see if the thing actually exists. */
SVN_ERR(svn_ra_check_path(ra_session, repos_relpath, SVN_INVALID_REVNUM,
&kind, pool));
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/fs_fs.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/fs_fs.c Mon Dec 19 15:53:06 2011
@@ -7095,6 +7095,10 @@ recover_body(void *baton, apr_pool_t *po
max_rev);
}
+ /* Prune younger-than-(newfound-youngest) revisions from the rep cache. */
+ if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
+ SVN_ERR(svn_fs_fs__del_rep_reference(fs, max_rev, pool));
+
/* Now store the discovered youngest revision, and the next IDs if
relevant, in a new 'current' file. */
return write_current(fs, max_rev, next_node_id, next_copy_id, pool);
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache-db.sql
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache-db.sql?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache-db.sql (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache-db.sql Mon Dec 19 15:53:06 2011
@@ -45,3 +45,7 @@ WHERE hash = ?1
-- STMT_SET_REP
INSERT OR FAIL INTO rep_cache (hash, revision, offset, size, expanded_size)
VALUES (?1, ?2, ?3, ?4, ?5)
+
+-- STMT_DEL_REPS_YOUNGER_THAN_REV
+DELETE FROM rep_cache
+WHERE revision > ?1
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.c Mon Dec 19 15:53:06 2011
@@ -218,3 +218,24 @@ svn_fs_fs__set_rep_reference(svn_fs_t *f
return SVN_NO_ERROR;
}
+
+
+svn_error_t *
+svn_fs_fs__del_rep_reference(svn_fs_t *fs,
+ svn_revnum_t youngest,
+ apr_pool_t *pool)
+{
+ fs_fs_data_t *ffd = fs->fsap_data;
+ svn_sqlite__stmt_t *stmt;
+
+ SVN_ERR_ASSERT(ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT);
+ if (! ffd->rep_cache_db)
+ SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
+
+ SVN_ERR(svn_sqlite__get_statement(&stmt, ffd->rep_cache_db,
+ STMT_DEL_REPS_YOUNGER_THAN_REV));
+ SVN_ERR(svn_sqlite__bindf(stmt, "r", youngest));
+ SVN_ERR(svn_sqlite__step_done(stmt));
+
+ return SVN_NO_ERROR;
+}
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.h?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.h (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/rep-cache.h Mon Dec 19 15:53:06 2011
@@ -62,6 +62,13 @@ svn_fs_fs__set_rep_reference(svn_fs_t *f
svn_boolean_t reject_dup,
apr_pool_t *pool);
+/* Delete from the cache all reps corresponding to revisions younger
+ than YOUNGEST. */
+svn_error_t *
+svn_fs_fs__del_rep_reference(svn_fs_t *fs,
+ svn_revnum_t youngest,
+ apr_pool_t *pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Propchange: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,2 +1,3 @@
+/subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c:1213306-1220745
/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,2 +1,3 @@
+/subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h:1213306-1220745
/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,5 +1,6 @@
+/subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c:1213306-1220745
/subversion/branches/diff-optimizations/subversion/libsvn_subr/adler32.c:1031270-1037352
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789
/subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365
/subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_subr/adler32.c:1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/hash.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/subversion/libsvn_subr/hash.c:870312
+/subversion/branches/1.7.x/subversion/libsvn_subr/hash.c:1213306-1220745
/subversion/branches/atomic-revprop/subversion/libsvn_subr/hash.c:965046-1000689
/subversion/branches/bdb-reverse-deltas/subversion/libsvn_subr/hash.c:872050-872529
/subversion/branches/diff-callbacks3/subversion/libsvn_subr/hash.c:870059-870761
@@ -53,4 +54,4 @@
/subversion/branches/tree-conflicts/subversion/libsvn_subr/hash.c:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_subr/hash.c:873926-874008
/subversion/branches/uris-as-urls/subversion/libsvn_subr/hash.c:1060426-1064427
-/subversion/trunk/subversion/libsvn_subr/hash.c:1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/hash.c:1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Propchange: subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,2 +1,3 @@
+/subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c:1213306-1220745
/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1143907,1143971,1144017,1144568
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1189190,1189395
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1189190,1189395,1207858,1207949,1210195,1211483,1211859,1211885
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/wc_db_pristine.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/wc_db_pristine.c Mon Dec 19 15:53:06 2011
@@ -225,7 +225,15 @@ svn_wc__db_pristine_read(svn_stream_t **
SVN_ERR_ASSERT(contents != NULL);
SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath));
- SVN_ERR_ASSERT(sha1_checksum != NULL);
+
+ /* Some 1.6-to-1.7 wc upgrades created rows without checksums and
+ updating such a row passes NULL here. */
+ if (!sha1_checksum)
+ return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
+ _("Can't read '%s' from pristine store "
+ "because no checksum supplied"),
+ svn_dirent_local_style(wri_abspath, scratch_pool));
+
SVN_ERR_ASSERT(sha1_checksum->kind == svn_checksum_sha1);
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath, db,
Modified: subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/workqueue.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/libsvn_wc/workqueue.c Mon Dec 19 15:53:06 2011
@@ -668,9 +668,24 @@ run_file_install(svn_wc__db_t *db,
local_relpath,
scratch_pool, scratch_pool));
}
+ else if (! checksum)
+ {
+ /* This error replaces a previous assertion. Reporting an error from here
+ leaves the workingqueue operation in place, so the working copy is
+ still broken!
+
+ But when we report this error the user at least knows what node has
+ this specific problem, so maybe we can find out why users see this
+ error */
+ return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
+ _("Can't install '%s' from pristine store, "
+ "because no checksum is recorded for this "
+ "file"),
+ svn_dirent_local_style(local_abspath,
+ scratch_pool));
+ }
else
{
- SVN_ERR_ASSERT(checksum != NULL);
SVN_ERR(svn_wc__db_pristine_get_future_path(&source_abspath,
wcroot_abspath,
checksum,
Modified: subversion/branches/1.7.x-r1210147/subversion/po/de.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/po/de.po?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/1.7.x-r1210147/subversion/po/de.po [UTF-8] Mon Dec 19 15:53:06 2011
@@ -236,9 +236,8 @@ msgid "Invalid character in hex checksum
msgstr "Ungültiges Zeichen in der Hex-Prüfsumme gefunden"
#: ../include/svn_error_codes.h:220
-#, fuzzy
msgid "Unknown string value of token"
-msgstr "Unbekannter Status für Sperrbefehl"
+msgstr "Unbekannter Zeichenkettenwert für Sperrmarke"
#: ../include/svn_error_codes.h:226
msgid "No such XML tag attribute"
@@ -303,9 +302,8 @@ msgid "Unrecognized stream data"
msgstr "Unbekannter Datenstrom"
#: ../include/svn_error_codes.h:294
-#, fuzzy
msgid "Stream doesn't support seeking"
-msgstr "Server unterstützt »edit pipelining« nicht"
+msgstr "Datenstrom unterstützt das Setzen der Position nicht"
#: ../include/svn_error_codes.h:300
msgid "Unknown svn_node_kind"
@@ -480,9 +478,8 @@ msgid "The specified node is not a symli
msgstr "Der spezifizierte Knoten ist kein symbolischer Link"
#: ../include/svn_error_codes.h:503
-#, fuzzy
msgid "The specified path has an unexpected status"
-msgstr "Die angegebene Vergleichsoption wird nicht unterstützt"
+msgstr "Der angegebene Pfad hat einen unerwarteten Status"
#: ../include/svn_error_codes.h:508
#, fuzzy
@@ -490,9 +487,8 @@ msgid "The working copy needs to be upgr
msgstr "Die Arbeitskopie fehlt"
#: ../include/svn_error_codes.h:513
-#, fuzzy
msgid "Previous operation was interrupted; run 'svn cleanup'"
-msgstr "Die Operation wurde unterbrochen"
+msgstr "Die vorhergehende Operation wurde unterbrochen; Starten Sie »svn cleanup«"
#: ../include/svn_error_codes.h:518
msgid "This operation can not be performed with just this depth."
@@ -883,9 +879,8 @@ msgid "Server SSL certificate untrusted"
msgstr "Server-SSL-Zertifikat ist nicht vertrauenswürdig"
#: ../include/svn_error_codes.h:986
-#, fuzzy
msgid "Initialization of the GSSAPI context failed"
-msgstr "Initialisierung der SSPI-Bibliothek schlug fehl"
+msgstr "Initialisierung des GSSAPI-Kontextes schlug fehl"
#: ../include/svn_error_codes.h:991
msgid "While handling serf response:"
@@ -1052,9 +1047,8 @@ msgid "A file external cannot overwrite
msgstr "Ein externer Dateiverweis kann kein existierendes versioniertes Objekt überschreiben"
#: ../include/svn_error_codes.h:1182
-#, fuzzy
msgid "Invalid path component strip count specified"
-msgstr "Ungültige Revision angegeben"
+msgstr "Ungültige Anzahl der vom Pfad zu entfernenden Komponenten angegeben"
#: ../include/svn_error_codes.h:1187
msgid "Detected a cycle while processing the operation"
@@ -1245,9 +1239,8 @@ msgid "No external merge tool available"
msgstr "Kein externes Werkzeug zum Zusammenführen verfügbar"
#: ../include/svn_error_codes.h:1396
-#, fuzzy
msgid "Failed processing one or more externals definitions"
-msgstr "»svn:externals«-Definitionen ignorieren"
+msgstr "Verarbeitung einer oder mehrerer »svn:externals«-Definitionen fehlgeschlagen"
#: ../include/svn_error_codes.h:1402
msgid "Assertion failure"
@@ -1287,9 +1280,9 @@ msgstr "»%s« endet mit einem reservier
#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
#: ../svn/upgrade-cmd.c:72
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a local path"
-msgstr "»%s« ist keine Datei"
+msgstr "»%s« ist kein lokaler Pfad"
#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
@@ -1348,9 +1341,9 @@ msgid "URL '%s' refers to a file, not a
msgstr "Die URL »%s« verweist auf eine Datei, nicht auf ein Verzeichnis"
#: ../libsvn_client/checkout.c:204
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
-msgstr "»%s« ist bereits eine Arbeitskopie für eine andere URL"
+msgstr "»%s« ist bereits eine Arbeitskopie für eine andere URL; Verwenden Sie »svn update« um sie zu aktualisieren"
#: ../libsvn_client/checkout.c:212
#, c-format
@@ -1418,9 +1411,8 @@ msgid "Error bumping revisions post-comm
msgstr "Fehler beim Weiterschalten der Revisionen nach der Übertragung (Details folgen):"
#: ../libsvn_client/commit.c:968
-#, fuzzy
msgid "Are all targets part of the same working copy?"
-msgstr "Sind alle Ziele Teil derselben Arbeitskopie?"
+msgstr "Sind alle Ziele Teil der selben Arbeitskopie?"
#: ../libsvn_client/commit.c:1007
msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
@@ -1513,9 +1505,8 @@ msgid "Path '%s' already exists, but is
msgstr "Pfad »%s« existiert bereits, ist aber kein Verzeichnis"
#: ../libsvn_client/copy.c:775
-#, fuzzy
msgid "Source and destination URLs appear not to all point to the same repository."
-msgstr "Quelle und Ziel scheinen sich nicht im selben Projektarchiv zu befinden (Quelle: »%s«; Ziel: »%s«)"
+msgstr "Quellen- und Ziel-URL scheinen nicht auf das selbe Projektarchiv zu zeigen."
#: ../libsvn_client/copy.c:985
#, c-format
@@ -1587,9 +1578,9 @@ msgid "'%s' is in the way of the resourc
msgstr "»%s« ist der Ressource, die sich unter Versionskontrolle befindet, im Weg"
#: ../libsvn_client/delete.c:74
-#, fuzzy, c-format
+#, c-format
msgid "'%s' has local modifications -- commit or revert them first"
-msgstr "»%s« hat lokale Änderungen"
+msgstr "»%s« hat lokale Änderungen -- zuerst übertragen oder zurücksetzen"
#: ../libsvn_client/delete.c:104
#, c-format
@@ -1598,9 +1589,9 @@ msgstr "Externer Dateiverweis bei »%s«
#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
-#, fuzzy, c-format
+#, c-format
msgid "Cannot mix repository and working copy targets"
-msgstr "Quellen aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden"
+msgstr "Ziele aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden"
#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
msgid "Cannot specify revisions (except HEAD) with move operations"
@@ -1611,9 +1602,8 @@ msgid "No commits in repository"
msgstr "Keine Übertragungen im Projektarchiv"
#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
-#, fuzzy
msgid "Non-recursive relocation not supported"
-msgstr "Umplatzieren innerhalb des Projektarchivs nicht erlaubt"
+msgstr "Nicht-rekursives Umplatzieren nicht unterstützt"
#: ../libsvn_client/diff.c:136
#, c-format
@@ -1652,9 +1642,9 @@ msgid "Cannot display: file marked as a
msgstr "Kann nicht anzeigen: Dateityp ist als binär angegeben.%s"
#: ../libsvn_client/diff.c:1326
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' has no URL"
-msgstr "»%s« hat keine URL"
+msgstr "Pfad »%s« hat keine URL"
#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
#: ../libsvn_client/merge.c:8984
@@ -1844,9 +1834,9 @@ msgid "Missing required revision specifi
msgstr "Es wurde keine Revision angegeben"
#: ../libsvn_client/log.c:401
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a relative path"
-msgstr "»%s« ist keine Datei"
+msgstr "»%s« ist kein relativer Pfad"
#: ../libsvn_client/log.c:422
msgid "When specifying working copy paths, only one target may be given"
@@ -1983,14 +1973,13 @@ msgid "Only depths 'infinity' and 'empty
msgstr ""
#: ../libsvn_client/patch.c:243
-#, fuzzy, c-format
+#, c-format
msgid "Cannot strip %u components from '%s'"
-msgstr "Zeile kann nicht in Komponenten zerlegt werden: »%s«"
+msgstr "Kann nicht %u Komponenten von »%s« entfernen"
#: ../libsvn_client/patch.c:2754
-#, fuzzy
msgid "strip count must be positive"
-msgstr "Parameter für --limit muss positiv sein"
+msgstr "Anzahl der zu entfernenden Komponenten muss positiv sein"
#: ../libsvn_client/prop_commands.c:80
#, c-format
@@ -2043,9 +2032,8 @@ msgid "revprop '%s' in r%ld is unexpecte
msgstr "Revisionseigenschaft »%s« in r%ld ist unerwarteterweise im Projektarchiv vorhanden (eventuell hat jemand anderer sie gesetzt?)"
#: ../libsvn_client/prop_commands.c:519
-#, fuzzy
msgid "Author name should not contain a newline; value will not be set unless forced"
-msgstr "Der Wert kann nur mittels »force« gesetzt werden"
+msgstr "Der Autorenname sollte keinen Zeilenvorschub enthalten; Wert kann nur mittels »force« gesetzt werden"
#: ../libsvn_client/prop_commands.c:764
#, c-format
@@ -2137,21 +2125,19 @@ msgstr "Die URL »%s« ist kein Kind der
#: ../libsvn_delta/svndiff.c:165
msgid "Compression of svndiff data failed"
-msgstr "Kompression der svndiff-Daten schlug fehl"
+msgstr "Komprimierung der svndiff-Daten schlug fehl"
#: ../libsvn_delta/svndiff.c:432
-#, fuzzy
msgid "Decompression of svndiff data failed: no size"
-msgstr "Dekompression der svndiff-Daten schlug fehl"
+msgstr "Dekomprimierung der svndiff-Daten schlug fehl: Größe fehlt"
#: ../libsvn_delta/svndiff.c:435
-#, fuzzy
msgid "Decompression of svndiff data failed: size too large"
-msgstr "Dekompression der svndiff-Daten schlug fehl"
+msgstr "Dekomprimierung der svndiff-Daten schlug fehl: Größe zu groß"
#: ../libsvn_delta/svndiff.c:456
msgid "Decompression of svndiff data failed"
-msgstr "Dekompression der svndiff-Daten schlug fehl"
+msgstr "Dekomprimierung der svndiff-Daten schlug fehl"
#: ../libsvn_delta/svndiff.c:463
msgid "Size of uncompressed data does not match stored original length"
@@ -2163,9 +2149,9 @@ msgid "Invalid diff stream: insn %d cann
msgstr "Ungültiger Diff-Strom: insn %d kann nicht dekodiert werden"
#: ../libsvn_delta/svndiff.c:542
-#, fuzzy, c-format
+#, c-format
msgid "Invalid diff stream: insn %d has length zero"
-msgstr "Ungültiger Diff-Strom: insn %d hat negative Länge"
+msgstr "Ungültiger Diff-Strom: insn %d hat Länge Null"
#: ../libsvn_delta/svndiff.c:546
#, c-format
@@ -4193,28 +4179,27 @@ msgid ""
msgstr ""
#: ../libsvn_ra_serf/util.c:1421
-#, fuzzy
msgid "Proxy authentication failed"
-msgstr "Authentifizierung schlug fehl"
+msgstr "Proxy-Anmeldung schlug fehl"
#: ../libsvn_ra_serf/util.c:1495
-#, fuzzy, c-format
+#, c-format
msgid "Premature EOF seen from server (http status=%d)"
-msgstr "Vorzeitiges EOF vom Server"
+msgstr "Vorzeitiges EOF vom Server (http Status=%d)"
#: ../libsvn_ra_serf/util.c:1547
-#, fuzzy, c-format
+#, c-format
msgid "Unspecified error message: %d %s"
-msgstr "Nicht spezifizierte Fehlermeldung"
+msgstr "Nicht spezifizierte Fehlermeldung: %d %s"
#: ../libsvn_ra_serf/util.c:1815
msgid "The OPTIONS response did not include the requested version-controlled-configuration value"
msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »version-controlled-configuration«"
#: ../libsvn_ra_serf/util.c:1932
-#, fuzzy, c-format
+#, c-format
msgid "'%s': no lock token available"
-msgstr "Keine Sperrmarke angegeben"
+msgstr "»%s«: Keine Sperrmarke verfügbar"
#: ../libsvn_ra_svn/client.c:136
#, c-format
@@ -6057,19 +6042,16 @@ msgid "SQLite is required to be compiled
msgstr "Es wird erwartet, dass SQLite im Thread-sicheren Modus kompiliert und gestartet wird"
#: ../libsvn_subr/sqlite.c:731
-#, fuzzy
msgid "Could not configure SQLite"
-msgstr "Konnte Datei nicht sichern"
+msgstr "Konnte SQLite nicht konfigurieren"
#: ../libsvn_subr/sqlite.c:733
-#, fuzzy
msgid "Could not initialize SQLite"
-msgstr "Konnte die SASL-Bibliothek nicht initialisieren"
+msgstr "Konnte SQLite nicht initialisieren"
#: ../libsvn_subr/sqlite.c:742
-#, fuzzy
msgid "Could not initialize SQLite shared cache"
-msgstr "Konnte die SASL-Bibliothek nicht initialisieren"
+msgstr "Konnte den gemeinsam genutzten SQLite-Zwischenspeicher nicht initialisieren"
#: ../libsvn_subr/sqlite.c:812
#, c-format
@@ -6109,7 +6091,7 @@ msgstr " (%a, %d. %b %Y)"
#: ../libsvn_subr/token.c:66
#, fuzzy, c-format
msgid "Token '%s' is unrecognized"
-msgstr "»%s« hat einen nicht erkannten Knotentyp"
+msgstr "Marke »%s« hat einen nicht erkannten Knotentyp"
#: ../libsvn_subr/utf.c:190
msgid "Can't lock charset translation mutex"
@@ -6381,9 +6363,9 @@ msgid "Tree conflicts can only be resolv
msgstr ""
#: ../libsvn_wc/copy.c:78
-#, fuzzy, c-format
+#, c-format
msgid "Source '%s' is unexpected kind"
-msgstr "Quelle »%s« ist kein Verzeichnis"
+msgstr "Quelle »%s« ist unbekannten Typs"
#: ../libsvn_wc/copy.c:384
#, fuzzy, c-format
@@ -6462,9 +6444,9 @@ msgid "Unexpectedly found '%s': path is
msgstr "Unerwartetes »%s« gefunden: Pfad wird als »fehlend« markiert"
#: ../libsvn_wc/entries.c:1148
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a versioned working copy"
-msgstr "»%s« ist keine Arbeitskopie"
+msgstr "»%s« ist keine versionierte Arbeitskopie"
#: ../libsvn_wc/entries.c:1394
#, fuzzy, c-format
@@ -6867,9 +6849,9 @@ msgid "Invalid source URL prefix: '%s' (
msgstr ""
#: ../libsvn_wc/relocate.c:146 ../libsvn_wc/relocate.c:151
-#, fuzzy, c-format
+#, c-format
msgid "Invalid destination URL: '%s'"
-msgstr "Ungültige URL »%s«"
+msgstr "Ungültige Ziel-URL: »%s«"
#: ../libsvn_wc/tree_conflicts.c:130
msgid "Unknown enumeration value in tree conflict description"
@@ -6976,9 +6958,9 @@ msgid "Unrecognized node kind: '%s'"
msgstr "Unbekannter Knotentyp: »%s«"
#: ../libsvn_wc/update_editor.c:5582
-#, fuzzy, c-format
+#, c-format
msgid "Node '%s' exists."
-msgstr "Datei »%s« existiert bereits"
+msgstr "Knoten »%s« existiert bereits"
#: ../libsvn_wc/update_editor.c:5637
#, c-format
@@ -7030,9 +7012,9 @@ msgid "No REPOSITORY table entry for id
msgstr "Kein REPOSITORY-Tabelleneintrag für ID »%ld«"
#: ../libsvn_wc/wc_db.c:1456 ../libsvn_wc/wc_db.c:1502
-#, fuzzy, c-format
+#, c-format
msgid "The node '%s' is not in a workingcopy."
-msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+msgstr "Der Knoten »%s« ist nicht in einer Arbeitskopie."
#: ../libsvn_wc/wc_db.c:2019 ../libsvn_wc/wc_db.c:5288
#, c-format
@@ -7100,24 +7082,24 @@ msgid "The properties of '%s' are in an
msgstr ""
#: ../libsvn_wc/wc_db.c:7643
-#, fuzzy, c-format
+#, c-format
msgid "Repository '%s' not found in the database"
-msgstr "Pfad »%s« wurde in der HEAD-Revision nicht gefunden"
+msgstr "Projektverzeichnis »%s« nicht in der Datenbank gefunden"
#: ../libsvn_wc/wc_db.c:8505 ../libsvn_wc/wc_db.c:8552
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is already locked."
-msgstr "Pfad ist bereits gesperrt"
+msgstr "»%s« ist bereits gesperrt"
#: ../libsvn_wc/wc_db.c:8509 ../libsvn_wc/wc_db.c:8560
-#, fuzzy, c-format
+#, c-format
msgid "Working copy '%s' locked."
-msgstr "Arbeitskopie »%s« gesperrt"
+msgstr "Arbeitskopie »%s« gesperrt."
#: ../libsvn_wc/wc_db.c:8639
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is already locked via '%s'."
-msgstr "Pfad ist bereits gesperrt"
+msgstr "»%s« ist bereits durch »%s« gesperrt"
#: ../libsvn_wc/wc_db.c:8753
#, fuzzy, c-format
@@ -7161,9 +7143,9 @@ msgid "Missing a row in WCROOT for '%s'.
msgstr "Fehlende Zeile in WCROOT für »%s«."
#: ../libsvn_wc/wc_db_pdh.c:668
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a working copy root"
-msgstr "»%s« ist keine Arbeitskopie"
+msgstr "»%s« ist keine Basis einer Arbeitskopie"
# CHECKME: What's WCROOT? A variable or short for "working copy root"?
#: ../libsvn_wc/wc_db_util.c:68
@@ -7490,9 +7472,9 @@ msgid "'--new' option only valid with '-
msgstr "Option »--new« ist nur in Verbindung mit der Option »--old« zulässig"
#: ../svn/diff-cmd.c:322
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' not relative to base URLs"
-msgstr "Pfad »%s« ist keine URL"
+msgstr "Pfad »%s« ist nicht relativ zur Basis-URL"
#: ../svn/export-cmd.c:113
msgid "Destination directory exists; please remove the directory or use --force to overwrite"
@@ -7532,13 +7514,12 @@ msgstr ""
"Verfügbare Unterbefehle:\n"
#: ../svn/help-cmd.c:63
-#, fuzzy
msgid ""
"Subversion is a tool for version control.\n"
"For additional information, see http://subversion.apache.org/\n"
msgstr ""
"Subversion ist ein Programm zur Versionskontrolle.\n"
-"Für weitere Informationen, siehe: http://subversion.tigris.org/\n"
+"Für weitere Informationen, siehe: http://subversion.apache.org/\n"
#: ../svn/help-cmd.c:70 ../svnrdump/svnrdump.c:349 ../svnsync/main.c:1762
msgid ""
@@ -7847,14 +7828,12 @@ msgid "'with-revprop' option only valid
msgstr "Option »with-revprop« ist nur im XML-Modus gültig"
#: ../svn/log-cmd.c:588
-#, fuzzy
msgid "'diff' option is not supported in XML mode"
-msgstr "Die angegebene Vergleichsoption wird nicht unterstützt"
+msgstr "Option »diff« wird im XML-Modus nicht unterstützt"
#: ../svn/log-cmd.c:594
-#, fuzzy
msgid "'quiet' and 'diff' options are mutually exclusive"
-msgstr "--relocate und --depth schließen sich gegenseitig aus"
+msgstr "»quiet« und »diff« schließen sich gegenseitig aus"
#: ../svn/log-cmd.c:598
msgid "'diff-cmd' option requires 'diff' option"
@@ -8176,9 +8155,8 @@ msgid "don't diff copied or moved files
msgstr ""
#: ../svn/main.c:326
-#, fuzzy
msgid "don't expand keywords"
-msgstr "Kann Zeitangabe nicht expandieren"
+msgstr "Schlüsselwörter nicht expandieren"
#: ../svn/main.c:328
msgid "apply the unidiff in reverse"
@@ -9678,14 +9656,13 @@ msgid "'%s' is not a valid --show-revs v
msgstr "»%s« ist kein gültiger Wert für --show-revs"
#: ../svn/main.c:1764
-#, fuzzy, c-format
+#, c-format
msgid "Invalid strip count '%s'"
-msgstr "Ungültiger Quellpfad einer Kopie: »%s«"
+msgstr "Ungültige Anzahl der zu entfernenden Komponenten »%s«"
#: ../svn/main.c:1770
-#, fuzzy
msgid "Argument to --strip must be positive"
-msgstr "Parameter für --limit muss positiv sein"
+msgstr "Parameter für --strip muss positiv sein"
#: ../svn/main.c:1851 ../svndumpfilter/main.c:1395 ../svnlook/main.c:2399
#: ../svnrdump/svnrdump.c:522
@@ -9730,9 +9707,8 @@ msgstr "--trust-server-cert erfordert --
# TODO: Duplicated message!!!!
#: ../svn/main.c:1970
-#, fuzzy
msgid "--diff-cmd and --internal-diff are mutually exclusive"
-msgstr "-c und -r schließen sich gegenseitig aus"
+msgstr "--diff-cmd und --internal-diff schließen sich gegenseitig aus"
#: ../svn/main.c:2030
msgid "Log message file is a versioned file; use '--force-log' to override"
@@ -9755,9 +9731,8 @@ msgid "--relocate and --depth are mutual
msgstr "--relocate und --depth schließen sich gegenseitig aus"
#: ../svn/main.c:2087
-#, fuzzy
msgid "--relocate and --non-recursive (-N) are mutually exclusive"
-msgstr "--relocate und --depth schließen sich gegenseitig aus"
+msgstr "--relocate und --non-recursive (-N) schließen sich gegenseitig aus"
#: ../svn/main.c:2171
msgid "--auto-props and --no-auto-props are mutually exclusive"
@@ -9822,15 +9797,13 @@ msgid "--force cannot be used with --rei
msgstr "--force kann nicht mit --reintegrate verwendet werden"
#: ../svn/merge-cmd.c:294
-#, fuzzy
msgid "--reintegrate can only be used with a single merge source"
-msgstr "--reintegrate kann nicht mit --ignore-ancestry verwendet werden"
+msgstr "--reintegrate kann nur mit einer einzelnen Zusammenführungsquelle verwendet werden"
# TODO: merge messages!!!
#: ../svn/merge-cmd.c:298
-#, fuzzy
msgid "--allow-mixed-revisions cannot be used with --reintegrate"
-msgstr "--force kann nicht mit --reintegrate verwendet werden"
+msgstr "--allow-mixed-revisions kann nicht mit --reintegrate verwendet werden"
#: ../svn/mergeinfo-cmd.c:81
msgid "Not enough arguments given"
@@ -10200,9 +10173,8 @@ msgid "Obliterate %8ld %s\n"
msgstr ""
#: ../svn/obliterate-cmd.c:111
-#, fuzzy
msgid "Wrong number of arguments"
-msgstr "Falsche Anzahl Ziele angegeben"
+msgstr "Falsche Anzahl von Argumenten"
#: ../svn/obliterate-cmd.c:116
#, fuzzy
@@ -10378,17 +10350,17 @@ msgid "local %s, incoming %s upon %s"
msgstr "lokal %s, eingehend %s bei %s"
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"Committed revision %ld%s.\n"
msgstr ""
"\n"
-"Revision %ld übertragen.\n"
+"Revision %ld%s übertragen.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
-msgstr ""
+msgstr " (die Antwort auf die Frage nach dem Leben, dem Universum und dem ganzen Rest)"
#: ../svn/util.c:87
#, c-format
@@ -10630,11 +10602,10 @@ msgid ""
msgstr "Ein mit Subversion-Versionen vor 1.6 kompatibles Format verwenden"
#: ../svnadmin/main.c:321
-#, fuzzy
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.7"
-msgstr "Ein mit Subversion-Versionen vor 1.4 kompatibles Format verwenden"
+msgstr "Ein mit Subversion-Versionen vor 1.7 kompatibles Format verwenden"
#: ../svnadmin/main.c:334
msgid ""
@@ -11897,9 +11868,9 @@ msgstr ""
"Verfügbare Unterbefehle:\n"
#: ../svnrdump/svnrdump.c:585
-#, fuzzy, c-format
+#, c-format
msgid "Revision %ld does not exist.\n"
-msgstr "URL »%s« existiert nicht in Revision %ld"
+msgstr "Revision %ld existiert nicht.\n"
#: ../svnrdump/svnrdump.c:592
#, c-format
@@ -12070,9 +12041,9 @@ msgstr ""
"Cyrus-SASL-Authentifizierung ist verfügbar.\n"
#: ../svnserve/main.c:487
-#, fuzzy, c-format
+#, c-format
msgid "Invalid port '%s'"
-msgstr "Ungültige URL »%s«"
+msgstr "Ungültiger Port »%s«"
#: ../svnserve/main.c:528
#, c-format
@@ -12370,9 +12341,8 @@ msgid "Destination repository is already
msgstr "Das Zielprojektarchiv synchronisiert bereits von »%s«"
#: ../svnsync/main.c:854
-#, fuzzy
msgid "Destination repository has more revisions than source repository"
-msgstr "Zielprojektarchiv wurde noch nicht initialisiert"
+msgstr "Zielprojektarchiv hat mehr Revisionen als Quellprojektarchiv"
#: ../svnsync/main.c:918 ../svnsync/main.c:921 ../svnsync/main.c:1425
#: ../svnsync/main.c:1432 ../svnsync/main.c:1667 ../svnsync/main.c:1670
@@ -12420,9 +12390,9 @@ msgid "Cannot specify revisions via both
msgstr ""
#: ../svnsync/main.c:1628 ../svnsync/main.c:1961
-#, fuzzy, c-format
+#, c-format
msgid "Invalid revision range '%s' provided"
-msgstr "Ungültige Revisionsnummer angegeben"
+msgstr "Ungültiger Revisionsbereich »%s« angegeben"
#: ../svnsync/main.c:1724
#, c-format
@@ -12555,24 +12525,24 @@ msgid "last changed rather than current
msgstr "gibt letzte geänderte statt aktueller Revisionen aus"
#: ../svnversion/main.c:232
-#, fuzzy, c-format
+#, c-format
msgid "Unversioned directory%s"
-msgstr "Keine versionierten Elternverzeichnisse"
+msgstr "Nicht versioniertes Verzeichnis%s"
#: ../svnversion/main.c:250 ../svnversion/main.c:266
-#, fuzzy, c-format
+#, c-format
msgid "Unversioned file%s"
-msgstr "nicht versioniert"
+msgstr "Nicht versionierte Datei%s"
#: ../svnversion/main.c:279
-#, fuzzy, c-format
+#, c-format
msgid "'%s' doesn't exist\n"
-msgstr "»%s« ist nicht vorhanden"
+msgstr "»%s« existiert nicht\n"
#: ../svnversion/main.c:287
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is of unknown type\n"
-msgstr "»%s« ist veraltet"
+msgstr "»%s« ist unbekannten Typs\n"
#. Local uncommitted modifications, no revision info was found.
#: ../svnversion/main.c:296
Modified: subversion/branches/1.7.x-r1210147/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/svnserve/serve.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/svnserve/serve.c (original)
+++ subversion/branches/1.7.x-r1210147/subversion/svnserve/serve.c Mon Dec 19 15:53:06 2011
@@ -243,6 +243,7 @@ svn_error_t *load_configs(svn_config_t *
*pwdb = NULL;
if (pwdb_path)
{
+ pwdb_path = svn_dirent_canonicalize(pwdb_path, pool);
pwdb_path = svn_dirent_join(base, pwdb_path, pool);
err = svn_config_read2(pwdb, pwdb_path, TRUE, FALSE, pool);
@@ -290,6 +291,7 @@ svn_error_t *load_configs(svn_config_t *
{
const char *case_force_val;
+ authzdb_path = svn_dirent_canonicalize(authzdb_path, pool);
authzdb_path = svn_dirent_join(base, authzdb_path, pool);
err = svn_repos_authz_read(authzdb, authzdb_path, TRUE, pool);
if (err)
Modified: subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py Mon Dec 19 15:53:06 2011
@@ -999,6 +999,7 @@ def verify_dir_deleted(path):
return 1
+@Issue(687,4074)
def basic_delete(sbox):
"basic delete command"
@@ -1190,6 +1191,12 @@ def basic_delete(sbox):
'rm', '-m', 'delete iota URL',
iota_URL)
+ # Issue 4074, deleting a root url SEGV.
+ expected_error = 'svn: E170000: .*not within a repository'
+ svntest.actions.run_and_verify_svn(None, [], expected_error,
+ 'rm', sbox.repo_url,
+ '--message', 'delete root')
+
#----------------------------------------------------------------------
def basic_checkout_deleted(sbox):
Propchange: subversion/branches/1.7.x-r1210147/subversion/tests/cmdline/basic_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 15:53:06 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/basic_tests.py:870312
+/subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py:1213306-1220745
/subversion/branches/1.7.x-JavaHL-pools/subversion/tests/cmdline/basic_tests.py:1158684-1158722
/subversion/branches/1.7.x-issue3888/subversion/tests/cmdline/basic_tests.py:1148937-1149162
/subversion/branches/1.7.x-issue3975/subversion/tests/cmdline/basic_tests.py:1160761-1161546
@@ -64,4 +65,4 @@
/subversion/branches/tree-conflicts/subversion/tests/cmdline/basic_tests.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/basic_tests.py:873926-874008
/subversion/branches/uris-as-urls/subversion/tests/cmdline/basic_tests.py:1060426-1064427
-/subversion/trunk/subversion/tests/cmdline/basic_tests.py:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,115
6312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222,1189190,1189395,1200837
+/subversion/trunk/subversion/tests/cmdline/basic_tests.py:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,115
6312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222,1189190,1189395,1200837,1207858,1207949,1210195,1211483,1211859,1211885
Modified: subversion/branches/1.7.x-r1210147/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1210147/tools/client-side/svnmucc/svnmucc.c?rev=1220809&r1=1220808&r2=1220809&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1210147/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/branches/1.7.x-r1210147/tools/client-side/svnmucc/svnmucc.c Mon Dec 19 15:53:06 2011
@@ -109,6 +109,7 @@ create_ra_callbacks(svn_ra_callbacks2_t
const char *username,
const char *password,
const char *config_dir,
+ svn_config_t *cfg_config,
svn_boolean_t non_interactive,
svn_boolean_t no_auth_cache,
apr_pool_t *pool)
@@ -119,7 +120,8 @@ create_ra_callbacks(svn_ra_callbacks2_t
non_interactive,
username, password, config_dir,
no_auth_cache,
- FALSE, NULL, NULL, NULL, pool));
+ FALSE /* trust_server_certs */,
+ cfg_config, NULL, NULL, pool));
(*callbacks)->open_tmp_file = open_tmp_file;
@@ -632,13 +634,17 @@ execute(const apr_array_header_t *action
struct operation root;
svn_error_t *err;
apr_hash_t *config;
+ svn_config_t *cfg_config;
int i;
SVN_ERR(svn_config_get_config(&config, config_dir, pool));
SVN_ERR(svn_cmdline__apply_config_options(config, config_options,
"svnmucc: ", "--config-option"));
+ cfg_config = apr_hash_get(config, SVN_CONFIG_CATEGORY_CONFIG,
+ APR_HASH_KEY_STRING);
SVN_ERR(create_ra_callbacks(&ra_callbacks, username, password, config_dir,
- non_interactive, no_auth_cache, pool));
+ cfg_config, non_interactive, no_auth_cache,
+ pool));
SVN_ERR(svn_ra_open4(&session, NULL, anchor, NULL, ra_callbacks,
NULL, config, pool));