subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1295534 [1/3] - in /subversion/branches/1.7.x-issue4087: ./ build/generator/ subversion/bindings/swig/python/tests/trac/versioncontrol/tests/ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_fs_fs/ subversion/libsvn_...
Date Thu, 01 Mar 2012 12:22:19 GMT
Author: stsp
Date: Thu Mar  1 12:22:17 2012
New Revision: 1295534

URL: http://svn.apache.org/viewvc?rev=1295534&view=rev
Log:
Sync the 1.7.x-issue4087 with 1.7.x. This exposes a test failure.
externals_test.py 38 (url-to-wc copy of externals) is failing on this branch.

Modified:
    subversion/branches/1.7.x-issue4087/   (props changed)
    subversion/branches/1.7.x-issue4087/CHANGES   (props changed)
    subversion/branches/1.7.x-issue4087/STATUS
    subversion/branches/1.7.x-issue4087/build/generator/gen_win.py
    subversion/branches/1.7.x-issue4087/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
    subversion/branches/1.7.x-issue4087/subversion/include/private/svn_adler32.h   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/include/private/svn_string_private.h   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/include/private/svn_temp_serializer.h   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/include/private/svn_wc_private.h
    subversion/branches/1.7.x-issue4087/subversion/libsvn_client/externals.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_client/merge.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/temp_serializer.c   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/temp_serializer.h   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_ra_serf/property.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_repos/log.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/adler32.c   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/hash.c   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/sqlite.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/svn_base64.c   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/svn_temp_serializer.c   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/adm_ops.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/externals.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/status.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db.c
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/1.7.x-issue4087/subversion/po/de.po
    subversion/branches/1.7.x-issue4087/subversion/po/zh_CN.po
    subversion/branches/1.7.x-issue4087/subversion/svn/log-cmd.c
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/basic_tests.py   (props changed)
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/diff_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/externals_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/lock_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/log_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/patch_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/special_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/stat_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/switch_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/update_tests.py
    subversion/branches/1.7.x-issue4087/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.7.x-issue4087/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,5 +1,6 @@
 /subversion/1.7.x-issue4059:1239661-1239744
 /subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x:1243707-1295531
 /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
@@ -9,6 +10,8 @@
 /subversion/branches/1.7.x-issue4035-r1185738:1186316-1186778
 /subversion/branches/1.7.x-issue4059:1239745-1242661
 /subversion/branches/1.7.x-issue4093:1229839-1230236
+/subversion/branches/1.7.x-issue4102:1292401-1295402
+/subversion/branches/1.7.x-issue4123:1293358-1293812
 /subversion/branches/1.7.x-issue4k:1166502-1167193
 /subversion/branches/1.7.x-neon-default:1148803-1158680
 /subversion/branches/1.7.x-r1152189:1152759-1154249
@@ -18,6 +21,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-r1210147:1213310-1293110
 /subversion/branches/1.7.x-r1213331:1213684-1213756
 /subversion/branches/1.7.x-r1232221:1232358-1238008
 /subversion/branches/1.7.x-r1236343:1236628-1239394
@@ -76,4 +80,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,1146762,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,1150344,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,115
 5404,1156085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,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,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1201002,1201072,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,12152
 60,1215288,1215374-1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242537,1242607,1243694,1243840,1243920,1244466,1244551,1295372
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,115
 5404,1156085,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1179776,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,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,12137
 11,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291680,1291685,1291700,1291704,1291726,1291729,1291941,1292090,1292255,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1294470,1295303,1295372

Propchange: subversion/branches/1.7.x-issue4087/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,10 +1,12 @@
 /subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x/CHANGES:1243707-1295531
 /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
 /subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
 /subversion/branches/1.7.x-r1155160/CHANGES:1158704-1159223
 /subversion/branches/1.7.x-r1159093/CHANGES:1159097-1159230
+/subversion/branches/1.7.x-r1210147/CHANGES:1213310-1293110
 /subversion/branches/atomic-revprop/CHANGES:965046-1000689
 /subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
 /subversion/branches/diff-callbacks3/CHANGES:870059-870761

Modified: subversion/branches/1.7.x-issue4087/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/STATUS?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/STATUS (original)
+++ subversion/branches/1.7.x-issue4087/STATUS Thu Mar  1 12:22:17 2012
@@ -15,91 +15,75 @@ Status of 1.7.4:
 Candidate changes:
 ==================
 
- * r1147540, r1147541
-   Remove unused variables in build system.
+ * r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372
+   Workaround for issue #4087, "bogus repos_id in wc.db for file externals"
    Justification:
-     Backporting of future changes will be easier.
-   Votes:
-     +1: arfrever
-     -0: stsp (we can backport these when we need to)
-     -0: gstein
-
- * 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.
+     Regression from 1.6. Some repositories with file externals cannot be
+     checked out with 1.7. Users complained.
+     See http://svn.haxx.se/users/archive-2011-12/0299.shtml
    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 -- r1220740 depends on r1220783 which
-               in turn needs new-in-1.8 APIs. Are there test failures
-               on Windows without it that cannot be fixed some other way?)
-     +1: julianfoad
-
- * r1235831, r1236099
-   Tweak the parsing of the ssl-authority-files config option to make it
-   easier for users to configure.
-   Justification:
-     Low impact change to help users.
+     ^/subversion/branches/1.7.x-issue4087
    Notes:
-     Both r1235831 and r1236099 conflict and will need a branch.
+     r1200277 was merged to simplify conflict resolution
+     r1243694 implements the workaround
+     r1243840 is a cosmetic follow-up treak
+     r1243920 was merged for conflict resolution for r1244466
+     r1244466 eliminates an unneccesary RA round-trip from r1243694
+     r1244551 uses a better API to query the local repos root and uuid
+     r1295372 improves test coverage
    Votes:
-     +1: gstein, rhuijben
+     +1: stsp
 
- * r1238121
-   Fix incorrect url construction in libsvn_ra_serf when svn_ra_get_dir2() is
-   called against a HTTPv2 server with a SVN_INVALID_REVNUM revision.
+ * r1291594
+   Support httpd-2.4 in davautocheck.
    Justification:
-     Privately reported as AnkhSVN issue.
+     Allow testing against imminently current stable httpd.
    Votes:
-     +1: rhuijben, philip
+     +1: danielsh
 
-Veto-blocked changes:
-=====================
-
- * r1146131 and followups
-   Add svn_fs_verify() and implement rep-cache verification in FSFS using it.
-   Branch:
-     1.7.x-fs-verify
+ * r1291797, r1291810
+   On Windows detect where perl is installed and add this information to the
+   include and lib directory settings of the swig-perl projects.
    Justification:
-     Would be nice to extend verify already in 1.7.x.
-   Notes:
-     This does not include progress reporting; that has been postponed to 1.8.
-   Conflicts:
-     On fs_fs.c.  Resolve with 'theirs-conflict'.
+     Allows building swig-perl without copying perl libraries manually.
+     Somehow required on the Windows buildbot since the last library version
+     bump.
    Votes:
-     +1: danielsh, rhuijben
-     +0: gstein (progress would be nice) (without r1161164, r1161180)
-     -0: cmpilato (For a function with this name, the implementation is far
-         too anemic. I'd prefer this be a private function in 1.7.x, leaving
-         room for a future public API that really does full verification.)
-         (without r1161164, r1161180)
-     -1: danielsh (invasive, new feature)
+     +1: rhuijben
 
- * r1220783
-   Fix mis-ordered text output of 'svn log --diff' on Windows.
+ * r1293945, r1293972, r1293976, r1293998, r1294136, r1294236;
+   r1294134, r1294147, r1294586
+   Two interdependent changes:
+   Fix issue #4121: copy followed by delete of unreadable child.
+   Fix svn:// authz in Python tests.
    Justification:
-     Badness within 'svn', fixed within 'svn'. Needed for r1210147 group.
+     User resorted to patching the commit editor to work around this.
+     Tests are broken.
+   Notes:
+     r1293945,r1293972,r1293976 are cosmetics.
+     r1293998 is the fix.
+     r1294136 is a test.
+     r1294236 fixes an uninitialized variable.
    Notes:
-     Doesn't compile on 1.7.x.
+     r1294134 extends a test to demonstrate its brokenness.
+     r1294147 fixes said brokenness.
+     r1294586 fixes r1294147 for Windows.
    Votes:
-     +1: julianfoad, rhuijben
-     -1: stsp (doesn't compile and would need new-in-1.8 public APIs).
+     +1: danielsh
 
- * r1221463
-   Allow leading "r" in ?p= query string arguments.
+ * r1295007
+   Include svnrdump in the Windows build.
    Justification:
-     Same as for allowing '-r r42' in svn(1).
+     I do not know for sure, but I assume that either make-dist.py or
+     vc6-build.bat.in is actually used by some people --- and if I'm wrong,
+     this would be harmless.
    Votes:
-     -0: rhuijben (Behavior change without positive votes? 1.8?)
-     -1: cmpilato (a rollback to an earlier patch release would break any
-                   bookmarks saved for URLs using the new syntax)
+     +1: danielsh
+
+
+Veto-blocked changes:
+=====================
+
 
 Approved changes:
 =================

Modified: subversion/branches/1.7.x-issue4087/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/build/generator/gen_win.py?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/build/generator/gen_win.py (original)
+++ subversion/branches/1.7.x-issue4087/build/generator/gen_win.py Thu Mar  1 12:22:17 2012
@@ -90,6 +90,7 @@ class GeneratorBase(gen_base.GeneratorBa
     self.sqlite_path = 'sqlite-amalgamation'
     self.skip_sections = { 'mod_dav_svn': None,
                            'mod_authz_svn': None,
+                           'mod_dontdothat' : None,
                            'libsvn_auth_kwallet': None,
                            'libsvn_auth_gnome_keyring': None }
 
@@ -126,6 +127,7 @@ class GeneratorBase(gen_base.GeneratorBa
         self.httpd_path = val
         del self.skip_sections['mod_dav_svn']
         del self.skip_sections['mod_authz_svn']
+        del self.skip_sections['mod_dontdothat']
       elif opt == '--with-libintl':
         self.libintl_path = val
         self.enable_nls = 1

Modified: subversion/branches/1.7.x-issue4087/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py (original)
+++ subversion/branches/1.7.x-issue4087/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py Thu Mar  1 12:22:17 2012
@@ -278,16 +278,27 @@ class SubversionRepositoryTestCase(unitt
 
     def test_diff_dir_different_dirs(self):
         diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
-        self._cmp_diff((None, ('branches/v1x/dir1', 12),
-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
-        self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12),
-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
-        self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12),
-                        (Node.DIRECTORY, Changeset.ADD)), diffs.next())
-        self._cmp_diff((None, ('branches/v1x/README.txt', 12),
-                        (Node.FILE, Changeset.ADD)), diffs.next())
-        self._cmp_diff((None, ('branches/v1x/README2.txt', 12),
-                        (Node.FILE, Changeset.ADD)), diffs.next())
+        expected = [
+          (None, ('branches/v1x/README.txt', 12),
+           (Node.FILE, Changeset.ADD)),
+          (None, ('branches/v1x/README2.txt', 12),
+           (Node.FILE, Changeset.ADD)),
+          (None, ('branches/v1x/dir1', 12),
+           (Node.DIRECTORY, Changeset.ADD)),
+          (None, ('branches/v1x/dir1/dir2', 12),
+           (Node.DIRECTORY, Changeset.ADD)),
+          (None, ('branches/v1x/dir1/dir3', 12),
+           (Node.DIRECTORY, Changeset.ADD)),
+        ]
+        actual = [diffs.next() for i in range(5)]
+        actual = sorted(actual, key=lambda diff: (diff[1].path, diff[1].rev))
+        # for e,a in zip(expected, actual):
+        #   t.write("%r\n" % (e,))
+        #   t.write("%r\n" % ((None, (a[1].path, a[1].rev), (a[2], a[3])),) )
+        #   t.write('\n')
+        self.assertEqual(len(expected), len(actual))
+        for e,a in zip(expected, actual):
+          self._cmp_diff(e,a)
         self.assertRaises(StopIteration, diffs.next)
 
     def test_diff_dir_no_change(self):

Propchange: subversion/branches/1.7.x-issue4087/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,4 +1,6 @@
 /subversion/branches/1.5.x-r30215/subversion/libsvn_diff/diff.h:870312
+/subversion/branches/1.7.x/subversion/include/private/svn_adler32.h:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/include/private/svn_adler32.h:1213310-1293110
 /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

Propchange: subversion/branches/1.7.x-issue4087/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,4 +1,6 @@
 /subversion/branches/1.5.x-r30215/subversion/include/svn_string.h:870312
+/subversion/branches/1.7.x/subversion/include/private/svn_string_private.h:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/include/private/svn_string_private.h:1213310-1293110
 /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

Propchange: subversion/branches/1.7.x-issue4087/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,2 +1,4 @@
+/subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/include/private/svn_temp_serializer.h:1213310-1293110
 /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,1207858,1207949,1210195,1211483,1211859,1211885

Modified: subversion/branches/1.7.x-issue4087/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/include/private/svn_wc_private.h?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/1.7.x-issue4087/subversion/include/private/svn_wc_private.h Thu Mar  1 12:22:17 2012
@@ -205,6 +205,15 @@ svn_wc__externals_gather_definitions(apr
                                      apr_pool_t *result_pool,
                                      apr_pool_t *scratch_pool);
 
+/* Close the DB for LOCAL_ABSPATH.  Perform temporary allocations in
+   SCRATCH_POOL.
+
+   Wraps svn_wc__db_drop_root(). */
+svn_error_t *
+svn_wc__close_db(const char *external_abspath,
+                 svn_wc_context_t *wc_ctx,
+                 apr_pool_t *scratch_pool);
+
 /** Set @a *tree_conflict to a newly allocated @c
  * svn_wc_conflict_description_t structure describing the tree
  * conflict state of @a victim_abspath, or to @c NULL if @a victim_abspath

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_client/externals.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_client/externals.c Thu Mar  1 12:22:17 2012
@@ -291,6 +291,9 @@ switch_dir_external(const char *local_ab
                                       SVN_INVALID_REVNUM,
                                       SVN_INVALID_REVNUM,
                                       pool));
+    /* Issue #4123: We don't need to keep the newly checked out external's
+       DB open. */
+    SVN_ERR(svn_wc__close_db(local_abspath, ctx->wc_ctx, pool));
   }
 
   return SVN_NO_ERROR;

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_client/merge.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_client/merge.c Thu Mar  1 12:22:17 2012
@@ -48,6 +48,7 @@
 #include "svn_props.h"
 #include "svn_time.h"
 #include "svn_sorts.h"
+#include "svn_subst.h"
 #include "svn_ra.h"
 #include "client.h"
 #include "mergeinfo.h"
@@ -1861,10 +1862,14 @@ files_same_p(svn_boolean_t *same,
       working_rev.kind = svn_opt_revision_working;
 
       /* Compare the file content, translating 'mine' to 'normal' form. */
-      SVN_ERR(svn_client__get_normalized_stream(&mine_stream, wc_ctx,
-                                                mine_abspath, &working_rev,
-                                                FALSE, TRUE, NULL, NULL,
-                                                scratch_pool, scratch_pool));
+      if (svn_prop_get_value(working_props, SVN_PROP_SPECIAL) != NULL)
+        SVN_ERR(svn_subst_read_specialfile(&mine_stream, mine_abspath,
+                                           scratch_pool, scratch_pool));
+      else
+        SVN_ERR(svn_client__get_normalized_stream(&mine_stream, wc_ctx,
+                                                  mine_abspath, &working_rev,
+                                                  FALSE, TRUE, NULL, NULL,
+                                                  scratch_pool, scratch_pool));
 
       SVN_ERR(svn_stream_open_readonly(&older_stream, older_abspath,
                                        scratch_pool, scratch_pool));

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/fs_fs.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/fs_fs.c Thu Mar  1 12:22:17 2012
@@ -5922,8 +5922,11 @@ validate_root_noderev(svn_fs_t *fs,
       return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
                                _("predecessor count for "
                                  "the root node-revision is wrong: "
-                                 "found %d, committing r%ld"),
-                                 root_noderev->predecessor_count, rev);
+                                 "found (%d+%ld != %d), committing r%ld"),
+                                 head_predecessor_count,
+                                 rev - head_revnum, /* This is equal to 1. */
+                                 root_noderev->predecessor_count,
+                                 rev);
     }
 
   return SVN_NO_ERROR;

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,2 +1,4 @@
+/subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.c:1213310-1293110
 /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,1207858,1207949,1210195,1211483,1211859,1211885

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,2 +1,4 @@
+/subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_fs_fs/temp_serializer.h:1213310-1293110
 /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,1207858,1207949,1210195,1211483,1211859,1211885

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_ra_serf/property.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_ra_serf/property.c Thu Mar  1 12:22:17 2012
@@ -988,32 +988,33 @@ svn_ra_serf__get_baseline_info(const cha
      revision (if needed) with an OPTIONS request.  */
   if (SVN_RA_SERF__HAVE_HTTPV2_SUPPORT(session))
     {
-      basecoll_url = apr_psprintf(pool, "%s/%ld",
-                                  session->rev_root_stub, revision);
+      svn_revnum_t actual_revision;
 
-      if (latest_revnum)
+      if (SVN_IS_VALID_REVNUM(revision))
         {
-          if (SVN_IS_VALID_REVNUM(revision))
-            {
-              *latest_revnum = revision;
-            }
-          else
-           {
-              svn_ra_serf__options_context_t *opt_ctx;
+          actual_revision = revision;
+        }
+      else
+        {
+          svn_ra_serf__options_context_t *opt_ctx;
 
-              SVN_ERR(svn_ra_serf__create_options_req(&opt_ctx, session, conn,
+          SVN_ERR(svn_ra_serf__create_options_req(&opt_ctx, session, conn,
                                                   session->session_url.path,
                                                   pool));
-              SVN_ERR(svn_ra_serf__context_run_wait(
+          SVN_ERR(svn_ra_serf__context_run_wait(
                 svn_ra_serf__get_options_done_ptr(opt_ctx), session, pool));
 
-             *latest_revnum = svn_ra_serf__options_get_youngest_rev(opt_ctx);
-             if (! SVN_IS_VALID_REVNUM(*latest_revnum))
-               return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
-                                       _("The OPTIONS response did not include "
-                                         "the youngest revision"));
-          }
+          actual_revision = svn_ra_serf__options_get_youngest_rev(opt_ctx);
+          if (! SVN_IS_VALID_REVNUM(actual_revision))
+            return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
+                                    _("The OPTIONS response did not include "
+                                      "the youngest revision"));
         }
+
+      basecoll_url = apr_psprintf(pool, "%s/%ld",
+                                  session->rev_root_stub, actual_revision);
+      if (latest_revnum)
+        *latest_revnum = actual_revision;
     }
 
   /* Otherwise, we fall back to the old VCC_URL PROPFIND hunt.  */
@@ -1021,7 +1022,7 @@ svn_ra_serf__get_baseline_info(const cha
     {
       SVN_ERR(svn_ra_serf__discover_vcc(&vcc_url, session, conn, pool));
 
-      if (revision != SVN_INVALID_REVNUM)
+      if (SVN_IS_VALID_REVNUM(revision))
         {
           /* First check baseline information cache. */
           SVN_ERR(svn_ra_serf__blncache_get_bc_url(&basecoll_url,

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_repos/log.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_repos/log.c Thu Mar  1 12:22:17 2012
@@ -1074,7 +1074,6 @@ send_log(svn_revnum_t rev,
       && log_target_history_as_mergeinfo
       && apr_hash_count(log_target_history_as_mergeinfo))
     {
-      svn_boolean_t path_is_in_history = FALSE;
       apr_hash_index_t *hi;
       apr_pool_t *subpool = svn_pool_create(pool);
 
@@ -1087,6 +1086,7 @@ send_log(svn_revnum_t rev,
            hi;
            hi = apr_hash_next(hi))
         {
+          svn_boolean_t path_is_in_history = FALSE;
           const char *changed_path = svn__apr_hash_index_key(hi);
           apr_hash_index_t *hi2;
           apr_pool_t *inner_subpool = svn_pool_create(subpool);

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,3 +1,5 @@
+/subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/adler32.c:1213310-1293110
 /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

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/hash.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,4 +1,6 @@
 /subversion/branches/1.5.x-r30215/subversion/libsvn_subr/hash.c:870312
+/subversion/branches/1.7.x/subversion/libsvn_subr/hash.c:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/hash.c:1213310-1293110
 /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

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/sqlite.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/sqlite.c Thu Mar  1 12:22:17 2012
@@ -120,16 +120,17 @@ struct svn_sqlite__value_t
 {                                                                \
   int sqlite_err__temp = (x);                                    \
   if (sqlite_err__temp != SQLITE_OK)                             \
-    return svn_error_create(SQLITE_ERROR_CODE(sqlite_err__temp), \
-                            NULL, sqlite3_errmsg((db)->db3));    \
+    return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
+                             NULL, "sqlite: %s",                 \
+                             sqlite3_errmsg((db)->db3));         \
 } while (0)
 
 #define SQLITE_ERR_MSG(x, msg) do                                \
 {                                                                \
   int sqlite_err__temp = (x);                                    \
   if (sqlite_err__temp != SQLITE_OK)                             \
-    return svn_error_create(SQLITE_ERROR_CODE(sqlite_err__temp), \
-                            NULL, msg);                          \
+    return svn_error_createf(SQLITE_ERROR_CODE(sqlite_err__temp), \
+                             NULL, "sqlite: %s", (msg));         \
 } while (0)
 
 
@@ -241,8 +242,8 @@ svn_sqlite__step(svn_boolean_t *got_row,
     {
       svn_error_t *err1, *err2;
 
-      err1 = svn_error_create(SQLITE_ERROR_CODE(sqlite_result), NULL,
-                              sqlite3_errmsg(stmt->db->db3));
+      err1 = svn_error_createf(SQLITE_ERROR_CODE(sqlite_result), NULL,
+                               "sqlite: %s", sqlite3_errmsg(stmt->db->db3));
       err2 = svn_sqlite__reset(stmt);
       return svn_error_compose_create(err1, err2);
     }
@@ -811,14 +812,15 @@ internal_open(sqlite3 **db3, const char 
       int err_code = sqlite3_open_v2(path, db3, flags, NULL);
       if (err_code != SQLITE_OK)
         {
+          /* Save the error message before closing the SQLite handle. */
           char *msg = apr_pstrdup(scratch_pool, sqlite3_errmsg(*db3));
 
           /* We don't catch the error here, since we care more about the open
              error than the close error at this point. */
           sqlite3_close(*db3);
 
-          msg = apr_pstrcat(scratch_pool, msg, ": '", path, "'", (char *)NULL);
-          return svn_error_create(SQLITE_ERROR_CODE(err_code), NULL, msg);
+          return svn_error_createf(SQLITE_ERROR_CODE(err_code), NULL,
+                                   "sqlite: %s: '%s'", msg, path);
         }
     }
   }

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/svn_base64.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,5 +1,6 @@
 /subversion/1.7.x-issue4059/subversion/libsvn_subr/svn_base64.c:1239661-1239744
 /subversion/branches/1.5.x-r30215/subversion/libsvn_subr/svn_base64.c:870312
+/subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c:1243707-1295531
 /subversion/branches/1.7.x-JavaHL-pools/subversion/libsvn_subr/svn_base64.c:1158684-1158722
 /subversion/branches/1.7.x-issue3888/subversion/libsvn_subr/svn_base64.c:1148937-1149162
 /subversion/branches/1.7.x-issue3975/subversion/libsvn_subr/svn_base64.c:1160761-1161546
@@ -18,6 +19,7 @@
 /subversion/branches/1.7.x-r1173425/subversion/libsvn_subr/svn_base64.c:1173429-1176454
 /subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/svn_base64.c:1186224-1186351
 /subversion/branches/1.7.x-r1201824/subversion/libsvn_subr/svn_base64.c:1202121-1207333
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/svn_base64.c:1213310-1293110
 /subversion/branches/1.7.x-r1213331/subversion/libsvn_subr/svn_base64.c:1213684-1213756
 /subversion/branches/1.7.x-r1232221/subversion/libsvn_subr/svn_base64.c:1232358-1238008
 /subversion/branches/1.7.x-r1236343/subversion/libsvn_subr/svn_base64.c:1236628-1239394
@@ -76,4 +78,4 @@
 /subversion/branches/tree-conflicts/subversion/libsvn_subr/svn_base64.c:868291-873154
 /subversion/branches/tree-conflicts-notify/subversion/libsvn_subr/svn_base64.c:873926-874008
 /subversion/branches/uris-as-urls/subversion/libsvn_subr/svn_base64.c:1060426-1064427
-/subversion/trunk/subversion/libsvn_subr/svn_base64.c:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1176
 949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1179776,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,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1213673,1213681,1213690,1
 213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242337
+/subversion/trunk/subversion/libsvn_subr/svn_base64.c:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,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,1150344,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,1156098,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,1158923-1158924,1158929,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,1163372,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166267,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,1176
 949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1179776,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,1195480,1197135,1197998,1199876,1199950,1200837,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1211483,1211859,1211885,1212476,1212482,1212484,1213331,1
 213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232413,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240752,1241530,1241553,1241713,1241726,1242116,1242337,1242537,1242607

Propchange: subversion/branches/1.7.x-issue4087/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:22:17 2012
@@ -1,2 +1,4 @@
+/subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c:1243707-1295531
+/subversion/branches/1.7.x-r1210147/subversion/libsvn_subr/svn_temp_serializer.c:1213310-1293110
 /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,1207858,1207949,1210195,1211483,1211859,1211885

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/adm_ops.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/adm_ops.c Thu Mar  1 12:22:17 2012
@@ -1553,8 +1553,15 @@ revert_restore(svn_wc__db_t *db,
         }
       else if (on_disk == svn_node_file && kind != svn_wc__db_kind_file)
         {
-          SVN_ERR(svn_io_remove_file2(local_abspath, FALSE, scratch_pool));
-          on_disk = svn_node_none;
+#ifdef HAVE_SYMLINK
+          /* Preserve symlinks pointing at directories. Changes on the
+           * directory node have been reverted. The symlink should remain. */
+          if (!(special && kind == svn_wc__db_kind_dir))
+#endif
+            {
+              SVN_ERR(svn_io_remove_file2(local_abspath, FALSE, scratch_pool));
+              on_disk = svn_node_none;
+            }
         }
       else if (on_disk == svn_node_file)
         {

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/externals.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/externals.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/externals.c Thu Mar  1 12:22:17 2012
@@ -1253,3 +1253,13 @@ svn_wc__externals_gather_definitions(apr
       return SVN_NO_ERROR;
     }
 }
+
+svn_error_t *
+svn_wc__close_db(const char *external_abspath,
+                 svn_wc_context_t *wc_ctx,
+                 apr_pool_t *scratch_pool)
+{
+  SVN_ERR(svn_wc__db_drop_root(wc_ctx->db, external_abspath,
+                               scratch_pool));
+  return SVN_NO_ERROR;
+}

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/status.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/status.c Thu Mar  1 12:22:17 2012
@@ -2383,6 +2383,28 @@ svn_wc__internal_walk_status(svn_wc__db_
   SVN_ERR(svn_io_stat_dirent(&dirent, local_abspath, TRUE,
                              scratch_pool, scratch_pool));
 
+#ifdef HAVE_SYMLINK
+  if (dirent->special && !skip_root)
+    {
+      svn_io_dirent2_t *this_dirent = svn_io_dirent2_dup(dirent,
+                                                         scratch_pool);
+
+      /* We're being pointed to the status root via a symlink.
+       * Get the real node kind and pretend the path is not a symlink.
+       * This prevents send_status_structure() from treating the root
+       * as a directory obstructed by a file. */
+      SVN_ERR(svn_io_check_resolved_path(local_abspath,
+                                         &this_dirent->kind, scratch_pool));
+      this_dirent->special = FALSE;
+      SVN_ERR(send_status_structure(&wb, local_abspath,
+                                    NULL, NULL, NULL,
+                                    dir_info, this_dirent, get_all,
+                                    status_func, status_baton,
+                                    scratch_pool));
+      skip_root = TRUE;
+    }
+#endif
+
   SVN_ERR(get_dir_status(&wb,
                          anchor_abspath,
                          target_name,

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db.c Thu Mar  1 12:22:17 2012
@@ -6670,6 +6670,49 @@ read_info(svn_wc__db_status_t *status,
 
 
 svn_error_t *
+svn_wc__db_read_info_internal(svn_wc__db_status_t *status,
+                              svn_wc__db_kind_t *kind,
+                              svn_revnum_t *revision,
+                              const char **repos_relpath,
+                              apr_int64_t *repos_id,
+                              svn_revnum_t *changed_rev,
+                              apr_time_t *changed_date,
+                              const char **changed_author,
+                              svn_depth_t *depth,
+                              const svn_checksum_t **checksum,
+                              const char **target,
+                              const char **original_repos_relpath,
+                              apr_int64_t *original_repos_id,
+                              svn_revnum_t *original_revision,
+                              svn_wc__db_lock_t **lock,
+                              svn_filesize_t *recorded_size,
+                              apr_time_t *recorded_mod_time,
+                              const char **changelist,
+                              svn_boolean_t *conflicted,
+                              svn_boolean_t *op_root,
+                              svn_boolean_t *had_props,
+                              svn_boolean_t *props_mod,
+                              svn_boolean_t *have_base,
+                              svn_boolean_t *have_more_work,
+                              svn_boolean_t *have_work,
+                              svn_wc__db_wcroot_t *wcroot,
+                              const char *local_relpath,
+                              apr_pool_t *result_pool,
+                              apr_pool_t *scratch_pool)
+{
+  return svn_error_trace(
+           read_info(status, kind, revision, repos_relpath, repos_id,
+                     changed_rev, changed_date, changed_author,
+                     depth, checksum, target, original_repos_relpath,
+                     original_repos_id, original_revision, lock,
+                     recorded_size, recorded_mod_time, changelist, conflicted,
+                     op_root, had_props, props_mod,
+                     have_base, have_more_work, have_work,
+                     wcroot, local_relpath, result_pool, scratch_pool));
+}
+
+
+svn_error_t *
 svn_wc__db_read_info(svn_wc__db_status_t *status,
                      svn_wc__db_kind_t *kind,
                      svn_revnum_t *revision,

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_private.h?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_private.h Thu Mar  1 12:22:17 2012
@@ -55,6 +55,7 @@ struct svn_wc__db_t {
   {
     svn_stringbuf_t *abspath;
     svn_node_kind_t kind;
+    svn_boolean_t is_symlink;
   } parse_cache;
 
   /* As we grow the state of this DB, allocate that state here. */
@@ -174,6 +175,39 @@ svn_wc__db_util_open_db(svn_sqlite__db_t
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool);
 
+/* Like svn_wc__db_read_info(), but taking WCROOT+LOCAL_RELPATH instead of
+   DB+LOCAL_ABSPATH, and outputting repos ids instead of URL+UUID. */
+svn_error_t *
+svn_wc__db_read_info_internal(svn_wc__db_status_t *status,
+                              svn_wc__db_kind_t *kind,
+                              svn_revnum_t *revision,
+                              const char **repos_relpath,
+                              apr_int64_t *repos_id,
+                              svn_revnum_t *changed_rev,
+                              apr_time_t *changed_date,
+                              const char **changed_author,
+                              svn_depth_t *depth,
+                              const svn_checksum_t **checksum,
+                              const char **target,
+                              const char **original_repos_relpath,
+                              apr_int64_t *original_repos_id,
+                              svn_revnum_t *original_revision,
+                              svn_wc__db_lock_t **lock,
+                              svn_filesize_t *recorded_size,
+                              apr_time_t *recorded_mod_time,
+                              const char **changelist,
+                              svn_boolean_t *conflicted,
+                              svn_boolean_t *op_root,
+                              svn_boolean_t *had_props,
+                              svn_boolean_t *props_mod,
+                              svn_boolean_t *have_base,
+                              svn_boolean_t *have_more_work,
+                              svn_boolean_t *have_work,
+                              svn_wc__db_wcroot_t *wcroot,
+                              const char *local_relpath,
+                              apr_pool_t *result_pool,
+                              apr_pool_t *scratch_pool);
+
 
 /* Transaction handling */
 

Modified: subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_wcroot.c?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/branches/1.7.x-issue4087/subversion/libsvn_wc/wc_db_wcroot.c Thu Mar  1 12:22:17 2012
@@ -105,12 +105,11 @@ get_old_version(int *version,
    Sets *KIND to svn_node_dir for symlinks. */
 static svn_error_t *
 get_path_kind(svn_node_kind_t *kind,
+              svn_boolean_t *is_symlink,
               svn_wc__db_t *db,
               const char *local_abspath,
               apr_pool_t *scratch_pool)
 {
-  svn_boolean_t special;
-
   /* This implements a *really* simple LRU cache, where "simple" is defined
      as "only one element".  In other words, we remember the most recently
      queried path, and nothing else.  This gives >80% cache hits. */
@@ -120,6 +119,7 @@ get_path_kind(svn_node_kind_t *kind,
     {
       /* Cache hit! */
       *kind = db->parse_cache.kind;
+      *is_symlink = db->parse_cache.is_symlink;
       return SVN_NO_ERROR;
     }
 
@@ -133,13 +133,11 @@ get_path_kind(svn_node_kind_t *kind,
       svn_stringbuf_set(db->parse_cache.abspath, local_abspath);
     }
 
-  SVN_ERR(svn_io_check_special_path(local_abspath, &db->parse_cache.kind,
-                                    &special, scratch_pool));
+  SVN_ERR(svn_io_check_special_path(local_abspath, kind,
+                                    is_symlink, scratch_pool));
 
-  /* The wcroot could be a symlink to a directory. (Issue #2557, #3987) */
-  if (special)
-    db->parse_cache.kind = svn_node_dir;
-  *kind = db->parse_cache.kind;
+  db->parse_cache.kind = *kind;
+  db->parse_cache.is_symlink = *is_symlink;
 
   return SVN_NO_ERROR;
 }
@@ -374,6 +372,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
   svn_sqlite__db_t *sdb;
   svn_boolean_t moved_upwards = FALSE;
   svn_boolean_t always_check = FALSE;
+  svn_boolean_t is_symlink;
   int wc_format = 0;
 
   /* ### we need more logic for finding the database (if it is located
@@ -401,8 +400,8 @@ svn_wc__db_wcroot_parse_local_abspath(sv
      ### rid of this stat() call. it is going to happen for EVERY call
      ### into wc_db which references a file. calls for directories could
      ### get an early-exit in the hash lookup just above.  */
-  SVN_ERR(get_path_kind(&kind, db, local_abspath, scratch_pool));
-  if (kind != svn_node_dir)
+  SVN_ERR(get_path_kind(&kind, &is_symlink, db, local_abspath, scratch_pool));
+  if (kind != svn_node_dir || is_symlink)
     {
       /* If the node specified by the path is NOT present, then it cannot
          possibly be a directory containing ".svn/wc.db".
@@ -511,6 +510,39 @@ svn_wc__db_wcroot_parse_local_abspath(sv
       if (svn_dirent_is_root(local_abspath, strlen(local_abspath)))
         {
           /* Hit the root without finding a wcroot. */
+
+          /* The wcroot could be a symlink to a directory.
+           * (Issue #2557, #3987). If so, try again, this time scanning
+           * for a db within the directory the symlink points to,
+           * rather than within the symlink's parent directory. */
+          if (is_symlink)
+            {
+              svn_node_kind_t resolved_kind;
+
+              local_abspath = original_abspath;
+
+              SVN_ERR(svn_io_check_resolved_path(local_abspath,
+                                                 &resolved_kind,
+                                                 scratch_pool));
+              if (resolved_kind == svn_node_dir)
+                {
+                  /* Is this directory recorded in our hash?  */
+                  found_wcroot = apr_hash_get(db->dir_data, local_abspath,
+                                              APR_HASH_KEY_STRING);
+                  if (found_wcroot)
+                    break;
+
+try_symlink_as_dir:
+                  kind = svn_node_dir;
+                  is_symlink = FALSE;
+                  moved_upwards = FALSE;
+                  local_dir_abspath = local_abspath;
+                  build_relpath = "";
+
+                  continue;
+                }
+            }
+
           return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL,
                                    _("'%s' is not a working copy"),
                                    svn_dirent_local_style(original_abspath,
@@ -584,6 +616,61 @@ svn_wc__db_wcroot_parse_local_abspath(sv
     *local_relpath = svn_relpath_join(dir_relpath, build_relpath, result_pool);
   }
 
+  if (is_symlink)
+    {
+      svn_boolean_t retry_if_dir = FALSE;
+      svn_wc__db_status_t status;
+      svn_boolean_t conflicted;
+      svn_error_t *err;
+
+      /* Check if the symlink is versioned or obstructs a versioned node
+       * in this DB -- in that case, use this wcroot. Else, if the symlink
+       * points to a directory, try to find a wcroot in that directory
+       * instead. */
+      
+      err = svn_wc__db_read_info_internal(&status, NULL, NULL, NULL, NULL,
+                                          NULL, NULL, NULL, NULL, NULL, NULL,
+                                          NULL, NULL, NULL, NULL, NULL, NULL,
+                                          NULL, &conflicted, NULL, NULL, NULL,
+                                          NULL, NULL, NULL,
+                                          *wcroot, *local_relpath,
+                                          scratch_pool, scratch_pool);
+      if (err)
+        {
+          if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND
+              && !SVN_WC__ERR_IS_NOT_CURRENT_WC(err))
+            return svn_error_trace(err);
+
+          svn_error_clear(err);
+          retry_if_dir = TRUE; /* The symlink is unversioned. */
+        }
+      else
+        {
+          /* The symlink is versioned, or obstructs a versioned node.
+           * Ignore non-conflicted not-present/excluded nodes.
+           * This allows the symlink to redirect the wcroot query to a
+           * directory, regardless of 'invisible' nodes in this WC. */
+          retry_if_dir = ((status == svn_wc__db_status_not_present ||
+                           status == svn_wc__db_status_excluded ||
+                           status == svn_wc__db_status_server_excluded)
+                          && !conflicted);
+        }
+
+      if (retry_if_dir)
+        {
+          svn_node_kind_t resolved_kind;
+
+          SVN_ERR(svn_io_check_resolved_path(original_abspath,
+                                             &resolved_kind,
+                                             scratch_pool));
+          if (resolved_kind == svn_node_dir)
+            {
+              local_abspath = original_abspath;
+              goto try_symlink_as_dir;
+            }
+        }
+    } 
+
   /* We've found the appropriate WCROOT for the requested path. Stash
      it into that path's directory.  */
   apr_hash_set(db->dir_data,

Modified: subversion/branches/1.7.x-issue4087/subversion/po/de.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4087/subversion/po/de.po?rev=1295534&r1=1295533&r2=1295534&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4087/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/1.7.x-issue4087/subversion/po/de.po [UTF-8] Thu Mar  1 12:22:17 2012
@@ -53,6 +53,7 @@
 # property     Eigenschaft
 # PROPNAME     PROPNAME
 # PROPVAL      PROPWERT
+# reintegrate  wiedereingliedern
 # relocate     umplatzieren
 # REPOS        PA
 # REPOS_PATH   ARCHIV_PFAD
@@ -482,9 +483,8 @@ msgid "The specified path has an unexpec
 msgstr "Der angegebene Pfad hat einen unerwarteten Status"
 
 #: ../include/svn_error_codes.h:508
-#, fuzzy
 msgid "The working copy needs to be upgraded"
-msgstr "Die Arbeitskopie fehlt"
+msgstr "Die Arbeitskopie muss in ein neueres Format gebracht werden"
 
 #: ../include/svn_error_codes.h:513
 msgid "Previous operation was interrupted; run 'svn cleanup'"
@@ -775,9 +775,8 @@ msgid "Repository root URL does not matc
 msgstr "Die URL der Projektarchivwurzel entspricht nicht der erwarteten Wurzel-URL"
 
 #: ../include/svn_error_codes.h:854
-#, fuzzy
 msgid "Session URL does not match expected session URL"
-msgstr "Die URL der Projektarchivwurzel entspricht nicht der erwarteten Wurzel-URL"
+msgstr "Die Sitzungs-URL entspricht nicht der erwarteten Sitzungs-URL"
 
 #: ../include/svn_error_codes.h:860
 msgid "RA layer failed to init socket layer"
@@ -1699,13 +1698,13 @@ msgid "'%s' already exists"
 msgstr "»%s« existiert bereits"
 
 #: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch for '%s':\n"
 "   expected:  %s\n"
 "     actual:  %s\n"
 msgstr ""
-"Prüfsummenfehler, Datei »%s«:\n"
+"Prüfsummenfehler für Datei »%s«:\n"
 "   Erwartet:    %s\n"
 "   Tatsächlich: %s\n"
 
@@ -1912,32 +1911,30 @@ msgstr "Die Zusammenführung aus fremdem
 
 #: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
 #: ../libsvn_client/merge.c:10523
-#, fuzzy, c-format
+#, c-format
 msgid "Merge target '%s' does not exist in the working copy"
-msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+msgstr "Zusammenführungsziel »%s« ist nicht in der Arbeitskopie enthalten"
 
 #: ../libsvn_client/merge.c:8896
-#, fuzzy
 msgid "Cannot merge into a working copy with a switched subtree"
-msgstr "Kann nicht zurück in eine Arbeitskopie mit umgestelltem Unterbaum integrieren"
+msgstr "Kann nicht in eine Arbeitskopie mit umgestelltem Unterbaum zusammenführen"
 
 #: ../libsvn_client/merge.c:8901
-#, fuzzy
 msgid "Cannot merge into a working copy that has local modifications"
-msgstr "Kann nicht zurück in eine Arbeitskopie integrieren, die lokale Änderungen hat"
+msgstr "Kann nicht in eine Arbeitskopie mit lokalen Änderungen zusammenführen"
 
 #: ../libsvn_client/merge.c:8918
 msgid "Cannot determine revision of working copy"
 msgstr "Die Revision der Arbeitskopie kann nicht bestimmt werden"
 
 #: ../libsvn_client/merge.c:8924
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
-msgstr "Kann nicht zurück in eine Arbeitskopie mit verschiedenen Revisionen integrieren, versuchen Sie erst zu aktualisieren"
+msgstr "Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen zusammenführen [%lu:%lu], versuchen Sie erst zu aktualisieren"
 
 #: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
 msgid "Merge sources must both be either paths or URLs"
-msgstr ""
+msgstr "Zusammenführungsquellen müssen beide Pfade oder URLs sein"
 
 #: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
 #, c-format
@@ -1955,9 +1952,9 @@ msgid "'%s' must be from the same reposi
 msgstr "»%s« muss aus dem selben Projektarchiv wie »%s« stammen"
 
 #: ../libsvn_client/merge.c:10290
-#, fuzzy, c-format
+#, c-format
 msgid "Neither the reintegrate source nor target can be the root of the repository"
-msgstr "»%s« ist nicht die Basis des Projektarchivs"
+msgstr "Weder die Quelle noch das Ziel der Wiedereingliederung darf Wurzel des Projektarchivs sein"
 
 #: ../libsvn_client/merge.c:10376
 #, c-format
@@ -2186,13 +2183,12 @@ msgid "Svndiff has invalid header"
 msgstr "Svndiff-Daten enthalten ungültigen Kopf"
 
 #: ../libsvn_delta/svndiff.c:744 ../libsvn_delta/svndiff.c:908
-#, fuzzy
 msgid "Svndiff contains a too-large window"
-msgstr "Svndiff-Daten enthalten defektes Fenster"
+msgstr "Svndiff-Daten enthalten ein zu großes Fenster"
 
 #: ../libsvn_delta/svndiff.c:751 ../libsvn_delta/svndiff.c:915
 msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff-Daten enthalten defektes Fenster"
+msgstr "Svndiff-Daten enthalten defekte Fenster-Kopfdaten"
 
 #: ../libsvn_delta/svndiff.c:760
 msgid "Svndiff has backwards-sliding source views"
@@ -2209,9 +2205,8 @@ msgid "The file '%s' changed unexpectedl
 msgstr "Die Datei »%s« veränderte sich unerwartet während des Vergleichs"
 
 #: ../libsvn_diff/diff_file.c:630
-#, fuzzy
 msgid "Error in options to internal diff"
-msgstr "Fehler beim Normalisieren des bearbeiteten Inhalts ins interne Format"
+msgstr "Fehler in Optionen für internes Vergleichsprogramm"
 
 #: ../libsvn_diff/diff_file.c:656
 #, c-format
@@ -2313,9 +2308,8 @@ msgid "Invalid change ordering: non-add 
 msgstr "Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf gelöschtem Pfad"
 
 #: ../libsvn_fs_base/bdb/changes-table.c:178 ../libsvn_fs_fs/fs_fs.c:4042
-#, fuzzy
 msgid "Invalid change ordering: add change on preexisting path"
-msgstr "Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf gelöschtem Pfad"
+msgstr "Ungültige Reihenfolge bei Änderung: Hinzufügende Änderung auf schon vorhandenem Pfad"
 
 #: ../libsvn_fs_base/bdb/changes-table.c:270
 #: ../libsvn_fs_base/bdb/changes-table.c:393
@@ -2353,16 +2347,13 @@ msgstr "Repräsentationsschlüssel für 
 msgid "storing checksum-reps record"
 msgstr "Speichere »checksum-reps«-Datensatz"
 
-# CHECKME: missing comma in msgstr? Two meanings are possible!?
-# "Allokiere neuen Darstellungswiederverwendungsschlüssel (hole »next-key«)"
 #: ../libsvn_fs_base/bdb/checksum-reps-table.c:186
 msgid "allocating new representation reuse ID (getting 'next-key')"
-msgstr "Allokiere neue Darstellung, verwende ID weiter (hole »next-key«)"
+msgstr "Allokiere neuen Wiederverwendungsschlüssel für Darstellung (hole »next-key«)"
 
 #: ../libsvn_fs_base/bdb/checksum-reps-table.c:207
-#, fuzzy
 msgid "bumping next representation reuse ID"
-msgstr "Erzeuge nächsten Darstellungsschlüssel"
+msgstr "Erzeuge nächsten Wiederverwendungsschlüssel für Darstellung"
 
 #: ../libsvn_fs_base/bdb/copies-table.c:92
 msgid "storing copy record"
@@ -2484,9 +2475,8 @@ msgid "Corrupt DB: initial revision numb
 msgstr "DB beschädigt: Erste Revision ist nicht »0« in Dateisystem »%s«"
 
 #: ../libsvn_fs_base/dag.c:293
-#, fuzzy
 msgid "Attempted to get entries of a non-directory node"
-msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten zu setzen"
+msgstr "Versuchte, Einträge eines *nicht* Verzeichnisknotens zu holen"
 
 #: ../libsvn_fs_base/dag.c:460 ../libsvn_fs_fs/dag.c:380
 #, c-format
@@ -2578,9 +2568,9 @@ msgid "Attempted to set textual contents
 msgstr "Versuchte, den Textinhalt eines nicht-veränderlichen Knotens zu setzen"
 
 #: ../libsvn_fs_base/dag.c:1280 ../libsvn_fs_base/reps-strings.c:829
-#, fuzzy, c-format
+#, c-format
 msgid "Checksum mismatch on representation '%s'"
-msgstr "Eine solche Darstellung »%s« existiert nicht"
+msgstr "Prüfsummenfehler in Darstellung »%s«"
 
 #: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:830
 #: ../libsvn_fs_base/reps-strings.c:926 ../libsvn_fs_base/reps-strings.c:941
@@ -2772,9 +2762,9 @@ msgid "Cannot verify lock on path '%s'; 
 msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine Benutzername verfügbar"
 
 #: ../libsvn_fs_base/lock.c:463 ../libsvn_fs_fs/lock.c:658
-#, fuzzy, c-format
+#, c-format
 msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')"
-msgstr "Benutzer %s besitzt die Sperre für Pfad »%s« nicht (derzeit gesperrt durch %s)"
+msgstr "Benutzer »%s« besitzt die Sperre für Pfad »%s« nicht (derzeit gesperrt durch »%s«)"
 
 #: ../libsvn_fs_base/lock.c:470 ../libsvn_fs_fs/lock.c:665
 #, c-format
@@ -2870,9 +2860,9 @@ msgid "Transaction is dead: '%s'"
 msgstr "Transaktion ist tot: »%s«"
 
 #: ../libsvn_fs_base/revs-txns.c:274 ../libsvn_fs_fs/fs_fs.c:7358
-#, fuzzy, c-format
+#, c-format
 msgid "revprop '%s' has unexpected value in filesystem"
-msgstr "»%s« ist im Dateisystem »%s« keine Datei"
+msgstr "Revisionseigenschaft »%s« hat einen unerwarteten Wert im Dateisystem"
 
 #: ../libsvn_fs_base/revs-txns.c:1231
 msgid "Transaction aborted, but cleanup failed"
@@ -2941,9 +2931,9 @@ msgid "Copy from mutable tree not curren
 msgstr "Kopieren eines veränderlichen Baumes wird derzeit nicht unterstützt"
 
 #: ../libsvn_fs_base/tree.c:3881 ../libsvn_fs_fs/tree.c:2462
-#, fuzzy, c-format
+#, c-format
 msgid "Base checksum mismatch on '%s'"
-msgstr "Ein Prüfsummenfehler ist aufgetreten"
+msgstr "Basis-Prüfsummenfehler bei »%s«"
 
 #: ../libsvn_fs_base/tree.c:4130 ../libsvn_fs_fs/tree.c:2694
 msgid "Cannot compare file contents between two different filesystems"
@@ -2987,9 +2977,9 @@ msgstr "Kann Zusammenführungsinformatio
 
 #: ../libsvn_fs_fs/dag.c:1026 ../libsvn_ra_neon/fetch.c:749
 #: ../libsvn_ra_svn/client.c:1072
-#, fuzzy, c-format
+#, c-format
 msgid "Checksum mismatch for '%s'"
-msgstr "Ein Prüfsummenfehler ist aufgetreten"
+msgstr "Prüfsummenfehler für »%s«"
 
 #: ../libsvn_fs_fs/dag.c:1131
 msgid "Empty noderev in cache"
@@ -3119,9 +3109,9 @@ msgid "Can't get exclusive lock on file 
 msgstr "Kann keinen exklusiven Zugriff auf Datei »%s« erlangen"
 
 #: ../libsvn_fs_fs/fs_fs.c:928
-#, fuzzy, c-format
+#, c-format
 msgid "Format file '%s' contains unexpected non-digit '%c' within '%s'"
-msgstr "Die Formatdatei »%s« enthält eine unerwartete Nicht-Ziffer"
+msgstr "Die Formatdatei »%s« enthält eine unerwartete Nicht-Ziffer »%c« innerhalb »%s«"
 
 #: ../libsvn_fs_fs/fs_fs.c:977
 #, c-format
@@ -3306,9 +3296,8 @@ msgstr "Kann Textinhalt im Verzeichnis n
 
 #: ../libsvn_fs_fs/fs_fs.c:5575 ../libsvn_fs_fs/fs_fs.c:5580
 #: ../libsvn_fs_fs/fs_fs.c:5587
-#, fuzzy
 msgid "Corrupt 'current' file"
-msgstr "Aktuelle Datei beschädigt"
+msgstr "Beschädigte Datei »current«"
 
 #: ../libsvn_fs_fs/fs_fs.c:6058
 msgid "Transaction out of date"
@@ -3460,20 +3449,20 @@ msgid "Repository UUID '%s' doesn't matc
 msgstr "UUID des Projektarchivs »%s« entspricht nicht der erwarteten UUID »%s«"
 
 #: ../libsvn_ra/ra_loader.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' isn't a child of session URL '%s'"
-msgstr "Die URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s«"
+msgstr "»%s« ist kein Kind der Sitzungs-URL »%s«"
 
 #: ../libsvn_ra/ra_loader.c:591 ../libsvn_ra_neon/session.c:1155
 #: ../libsvn_ra_svn/client.c:2271
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' isn't a child of repository root URL '%s'"
-msgstr "Die URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s«"
+msgstr "»%s« ist kein Kind der Projektarchivwurzel-URL »%s«"
 
 #: ../libsvn_ra/ra_loader.c:638
-#, fuzzy, c-format
+#, c-format
 msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client"
-msgstr "Das Speichern der speziellen Eigenschaft »%s« wird vom Projektarchiv verhindert und könnte auf einen Bug in Ihrem Client hindeuten"
+msgstr "Die Angabe von »old_value_p« is nicht erlaubt, wenn die Fähigkeit »%s« nicht bekanntgemacht wurde, und könnte auf einen Bug in Ihrem Client hindeuten"
 
 #: ../libsvn_ra/ra_loader.c:1238
 msgid "Obliterate is not supported by this Repository Access method"
@@ -3805,9 +3794,9 @@ msgid "Failed to find label '%s' for URL
 msgstr "Marke »%s« für URL »%s« nicht gefunden"
 
 #: ../libsvn_ra_neon/props.c:636
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' was not present on the resource '%s'"
-msgstr "»%s« existierte nicht für die Ressource"
+msgstr "»%s« existierte nicht für die Ressource »%s«"
 
 #: ../libsvn_ra_neon/props.c:703
 #, c-format
@@ -4026,12 +4015,15 @@ msgid "Incorrect response-digest in Auth
 msgstr "Falsche Antwortnummer im Header der Authentifizierungs-Informationen."
 
 #: ../libsvn_ra_serf/auth_kerb.c:160
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Initialization of the GSSAPI context failed.\n"
 " %s\n"
 " %s\n"
-msgstr "Initialisierung der SSPI-Bibliothek schlug fehl"
+msgstr ""
+"Initialisierung des GSSAPI-Kontextes schlug fehl.\n"
+" %s\n"
+" %s\n"
 
 #: ../libsvn_ra_serf/commit.c:307
 msgid "No Location header received"
@@ -4168,9 +4160,9 @@ msgid "Error retrieving REPORT (%d)"
 msgstr "Fehler beim Holen von REPORT (%d)"
 
 #: ../libsvn_ra_serf/util.c:699 ../libsvn_ra_serf/util.c:702
-#, fuzzy, c-format
+#, c-format
 msgid "Error running context"
-msgstr "Fehler beim Ausführen des Editors."
+msgstr "Fehler beim Ausführen des Kontextes"
 
 #: ../libsvn_ra_serf/util.c:1398
 msgid ""
@@ -4397,9 +4389,8 @@ msgid "Expected 'revprops', found '%s'"
 msgstr "Erwartete »revprops«, fand »%s«"
 
 #: ../libsvn_ra_svn/client.c:2424
-#, fuzzy
 msgid "Error while replaying commit"
-msgstr "Beim Vorbereiten von »%s« für die Übertragung"
+msgstr "Fehler beim Wiederholen der Übertragung"
 
 #: ../libsvn_ra_svn/client.c:2488
 msgid "'get-deleted-rev' not implemented"
@@ -4527,15 +4518,13 @@ msgid "Source url '%s' is from different
 msgstr "Quell URL »%s« stammt aus einem fremden Projektarchiv"
 
 #: ../libsvn_repos/commit.c:606
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch for resulting fulltext\n"
 "(%s)"
 msgstr ""
-"Prüfsummenfehler für Volltextergebnis:\n"
-"(%s):\n"
-"   Erwartet:    %s\n"
-"   Tatsächlich: %s\n"
+"Prüfsummenfehler für Volltextergebnis\n"
+"(%s)"
 
 #: ../libsvn_repos/delta.c:191
 msgid "Unable to open root of edit"
@@ -5695,9 +5684,9 @@ msgid "Invalid character '%c' found in r
 msgstr "Ungültiges Zeichen »%c« in Revisionsliste gefunden"
 
 #: ../libsvn_subr/mergeinfo.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid revision number '0' found in range list"
-msgstr "Ungültige Revisionsnummer beim Einlesen von »%s« gefunden"
+msgstr "Ungültige Revisionsnummer '0' in Revisionsbereichsliste gefunden"
 
 #: ../libsvn_subr/mergeinfo.c:523
 #, c-format
@@ -6069,9 +6058,9 @@ msgid "File '%s' has inconsistent newlin
 msgstr "Datei »%s« hat inkonsistente Zeilenenden"
 
 #: ../libsvn_subr/svn_string.c:706 ../libsvn_subr/svn_string.c:750
-#, fuzzy, c-format
+#, c-format
 msgid "Could not convert '%s' into a number"
-msgstr "Konnte keine Verbindung zum Server herstellen"
+msgstr "Konnte »%s« nicht in Zahl umwandeln"
 
 #: ../libsvn_subr/svn_string.c:712
 #, c-format
@@ -6884,13 +6873,13 @@ msgid "Attempt to add tree conflict that
 msgstr "Es wurde versucht, einen Baumkonflikt hinzuzufügen, den es bereits gibt"
 
 #: ../libsvn_wc/update_editor.c:1051
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch while updating '%s':\n"
 "   expected:  %s\n"
 "     actual:  %s\n"
 msgstr ""
-"Prüfsummenfehler, Datei »%s«:\n"
+"Prüfsummenfehler beim Aktualisieren von »%s«:\n"
 "   Erwartet:    %s\n"
 "   Tatsächlich: %s\n"
 
@@ -10163,9 +10152,9 @@ msgid "Upgraded '%s'.\n"
 msgstr "Überspringe »%s«\n"
 
 #: ../svn/notify.c:885
-#, fuzzy, c-format
+#, c-format
 msgid "Redirecting to URL '%s'\n"
-msgstr "Umleitung zur URL »%s«"
+msgstr "Umleitung zur URL »%s«\n"
 
 #: ../svn/obliterate-cmd.c:60
 #, c-format
@@ -10177,9 +10166,8 @@ msgid "Wrong number of arguments"
 msgstr "Falsche Anzahl von Argumenten"
 
 #: ../svn/obliterate-cmd.c:116
-#, fuzzy
 msgid "Target must specify the revision as a number"
-msgstr "Revisionsnummer PAR angegeben"
+msgstr "Ziel muss die Revision als Zahl angegeben"
 
 #: ../svn/obliterate-cmd.c:119
 msgid "Target must specify a URL"
@@ -10458,9 +10446,8 @@ msgstr ""
 "(A)bbrechen, Weiterma(c)hen, (E)ditieren:\n"
 
 #: ../svn/util.c:903
-#, fuzzy
 msgid "Use --force to override this restriction (local modifications may be lost)"
-msgstr "Benutzen Sie »--force«, um diese Einschränkung aufzuheben"
+msgstr "Benutzen Sie »--force«, um diese Einschränkung aufzuheben (lokale Änderungen könnten verloren gehen)"
 
 # CHECKME! Here used beside "dir" and "file".
 #: ../svn/util.c:1050 ../svn/util.c:1083
@@ -10935,17 +10922,15 @@ msgstr "Bilde Deltas für Revision %ld .
 msgid "done.\n"
 msgstr "erledigt.\n"
 
-# shard ???? Teil(stück)?
 #: ../svnadmin/main.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "Packing revisions in shard %s..."
-msgstr "Packe %s ..."
+msgstr "Packe Revisionen in Fragment %s ..."
 
-# shard ???? Teil(stück)?
 #: ../svnadmin/main.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "Packing revprops in shard %s..."
-msgstr "Packe %s ..."
+msgstr "Packe Revisionseigenschaften in Fragment %s ..."
 
 #: ../svnadmin/main.c:792
 #, c-format
@@ -11267,24 +11252,24 @@ msgid "Including prefixes:\n"
 msgstr "Präfixe einschließen:\n"
 
 #: ../svndumpfilter/main.c:1116
-#, fuzzy, c-format
+#, c-format
 msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
-msgstr "Präfixe ausschließen (und leere Revisionen verwerfen):\n"
+msgstr "Präfixmuster ausschließen (und leere Revisionen verwerfen):\n"
 
 #: ../svndumpfilter/main.c:1118
-#, fuzzy, c-format
+#, c-format
 msgid "Excluding prefix patterns:\n"
-msgstr "Präfixe ausschließen:\n"
+msgstr "Präfixmuster ausschließen:\n"
 
 #: ../svndumpfilter/main.c:1120
-#, fuzzy, c-format
+#, c-format
 msgid "Including (and dropping empty revisions for) prefix patterns:\n"
-msgstr "Präfixe einschließen (und leere Revisionen verwerfen):\n"
+msgstr "Präfixmuster einschließen (und leere Revisionen verwerfen):\n"
 
 #: ../svndumpfilter/main.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "Including prefix patterns:\n"
-msgstr "Präfixe einschließen:\n"
+msgstr "Präfixmuster einschließen:\n"
 
 #: ../svndumpfilter/main.c:1150
 #, c-format
@@ -11482,17 +11467,16 @@ msgstr ""
 "bzw. deren Dateien geändert wurden.\n"
 
 #: ../svnlook/main.c:221
-#, fuzzy
 msgid ""
 "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
 "\n"
 "Print the size (in bytes) of the file located at PATH_IN_REPOS as\n"
 "it is represented in the repository.\n"
 msgstr ""
-"Aufruf: svnadmin lslocks ARCHIV_PFAD [PFAD-IN-ARCHIV]\n"
+"Aufruf: svnlook filesize ARCHIV_PFAD PFAD_IN_ARCHIV\n"
 "\n"
-"Gibt Beschreibungen aller Sperren auf oder unter PFAD-IN-ARCHIV aus (was,\n"
-"falls nicht angegeben, die Wurzel des Projektarchivs ist).\n"
+"Gibt die Größe (in Bytes) der in PFAD_IN_ARCHIV befindlichen Datei\n"
+"aus, wie sie im Projektarchiv vorliegt.\n"
 
 #: ../svnlook/main.c:227
 msgid ""
@@ -11799,11 +11783,9 @@ msgstr ""
 "»%s« gehalten wird\n"
 
 #: ../svnrdump/load_editor.c:167 ../svnsync/main.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't get lock on destination repos after %d attempts"
-msgstr ""
-"Konnte Sperre für Zielprojektarchiv nicht erhalten, die zurzeit von\n"
-"»%s« gehalten wird\n"
+msgstr "Konnte Sperre für Zielprojektarchiv nach %d Versuchen nicht erhalten"
 
 #: ../svnrdump/load_editor.c:684
 msgid "\"svnrdump load\"'s lock was stolen; can't remove it"
@@ -11825,13 +11807,12 @@ msgid ""
 msgstr ""
 
 #: ../svnrdump/svnrdump.c:69
-#, fuzzy
 msgid ""
 "usage: svnrdump help [SUBCOMMAND...]\n"
 "\n"
 "Describe the usage of this program or its subcommands.\n"
 msgstr ""
-"Aufruf: svnadmin help [UNTERBEFEHL...]\n"
+"Aufruf: svnrdump help [UNTERBEFEHL...]\n"
 "\n"
 "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
 
@@ -11840,30 +11821,27 @@ msgid "display this help"
 msgstr "Hilfe anzeigen"
 
 #: ../svnrdump/svnrdump.c:91 ../svnsync/main.c:196
-#, fuzzy
 msgid ""
 "set user configuration option in the format:\n"
 "                                 FILE:SECTION:OPTION=[VALUE]\n"
 "                             For example:\n"
 "                                 servers:global:http-library=serf"
 msgstr ""
-"Setze Benutzerkonfigurationsoption im Format:\n"
+"Setzt Benutzerkonfigurationsoption im Format:\n"
 "                                 DATEI:ABSCHNITT:OPTION=[WERT]\n"
 "                             Zum Beispiel:\n"
-"                                 servers:global:http-library=serf\n"
+"                                 servers:global:http-library=serf"
 
 #: ../svnrdump/svnrdump.c:405
-#, fuzzy
 msgid ""
 "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n"
 "Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
-"Aufruf: svndumpfilter UNTERBEFEHL [Optionen & Parameter ...]\n"
-"Geben Sie »svndumpfilter help <Unterbefehl>« ein, um Hilfe zu einem\n"
+"Aufruf: svnrdump UNTERBEFEHL URL [-r [ VON[:BIS]]\n"
+"Geben Sie »svnrdump help <Unterbefehl>« ein, um Hilfe zu einem\n"
 "          Unterbefehl zu erhalten.\n"
-"Geben Sie »svndumpfilter --version« ein, um die Programmversion zu sehen.\n"
 "\n"
 "Verfügbare Unterbefehle:\n"
 



Mime
View raw message