subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1104382 - in /subversion/branches/1.6.x: ./ subversion/include/private/ subversion/libsvn_fs_fs/ subversion/mod_dav_svn/ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/
Date Tue, 17 May 2011 16:22:23 GMT
Author: hwright
Date: Tue May 17 16:22:22 2011
New Revision: 1104382

URL: http://svn.apache.org/viewvc?rev=1104382&view=rev
Log:
Reintegrate the 1.6.x-r878607 branch:

 * r878590, r878607, r878625, r878626, r878627
   In trunk we optimized the common case of 'find-and-replace with same uri'
   of proxied content thanks to issue 3445 "WebDAV proxy code munging user
   data".
   r878590 is just a change that adds FIXME marker to code comment. We take it
   to avoid spurious conflicts with other revisions.
   r878607 Special cases no-op find and replace.
   "r878625, r878626, r878627" are follow-up to r878607 and the other long 
   pending Master info leak to the clients.
   Justification:
     1. This group has the most common 'optimization' fix of *not* groking the
        proxied response to find and replace with same string.
     2. Fixes the master information leak via the Location header.
     3. Need this to be ported for the other defect to be ported
        without conflict.
   Branch:
     ^/subversion/branches/1.6.x-r878590
   Votes:
     +1: kameshj, cmpilato, pburba
     -0: julianfoad (seem to be multiple changes here for different reasons -
           at least issue '3445 and an optimization and an information leak;
           r878607 log msg says it fixes bugs but it's not clear what bugs;
           don't know how to tell whether justification 1 is significant;
           justifications don't seem to refer to issue #3445. Please can we
           separate these changes and clearly describe each one? And update
           the r878607 log msg.)

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/CHANGES   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/get-deps.sh   (props changed)
    subversion/branches/1.6.x/subversion/include/private/svn_repos_private.h   (props changed)
    subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c   (props changed)
    subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
    subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py   (props changed)
    subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py   (props changed)

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -59,6 +59,7 @@
 /subversion/branches/1.6.x-r39887:880024-880066
 /subversion/branches/1.6.x-r40452:880530-890996
 /subversion/branches/1.6.x-r877814:1003097-1033216
+/subversion/branches/1.6.x-r878590:1104266-1104381
 /subversion/branches/1.6.x-r879757:987687-999407
 /subversion/branches/1.6.x-r880146:1071612-1072350
 /subversion/branches/1.6.x-r889840:889888-890974
@@ -114,4 +115,4 @@
 /subversion/branches/tc_url_rev:874351-874483
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
 9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,
 879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,10
 22675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1102803,1103665
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
 9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,
 879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,100061
 2,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1102803,1103665

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -56,6 +56,7 @@
 /subversion/branches/1.6.x-r39887/CHANGES:880024-880066
 /subversion/branches/1.6.x-r40452/CHANGES:880530-890996
 /subversion/branches/1.6.x-r877814/CHANGES:1003097-1033216
+/subversion/branches/1.6.x-r878590/CHANGES:1104266-1104381
 /subversion/branches/1.6.x-r879757/CHANGES:987687-999407
 /subversion/branches/1.6.x-r880146/CHANGES:1071612-1072350
 /subversion/branches/1.6.x-r889840/CHANGES:889888-890974

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1104382&r1=1104381&r2=1104382&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 16:22:22 2011
@@ -246,33 +246,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r878590, r878607, r878625, r878626, r878627
-   In trunk we optimized the common case of 'find-and-replace with same uri'
-   of proxied content thanks to issue 3445 "WebDAV proxy code munging user
-   data".
-   r878590 is just a change that adds FIXME marker to code comment. We take it
-   to avoid spurious conflicts with other revisions.
-   r878607 Special cases no-op find and replace.
-   "r878625, r878626, r878627" are follow-up to r878607 and the other long 
-   pending Master info leak to the clients.
-   Justification:
-     1. This group has the most common 'optimization' fix of *not* groking the
-        proxied response to find and replace with same string.
-     2. Fixes the master information leak via the Location header.
-     3. Need this to be ported for the other defect to be ported
-        without conflict.
-   Branch:
-     ^/subversion/branches/1.6.x-r878590
-   Votes:
-     +1: kameshj, cmpilato, pburba
-     -0: julianfoad (seem to be multiple changes here for different reasons -
-           at least issue '3445 and an optimization and an information leak;
-           r878607 log msg says it fixes bugs but it's not clear what bugs;
-           don't know how to tell whether justification 1 is significant;
-           justifications don't seem to refer to issue #3445. Please can we
-           separate these changes and clearly describe each one? And update
-           the r878607 log msg.)
-
  * r880027
    Follow-up on already backported 1.6.x-svn_fs_commit_txn branch branch;
    export the new private functions from the shared libraries on Windows.
@@ -284,4 +257,3 @@ Approved changes:
                   (private/svn_repos_private.h), but the additional one
                   (private/svn_client_private.h) doesn't hurt either, so ok)
      +1 (second hunk only): danielsh, rhuijben, pburba
-

Propchange: subversion/branches/1.6.x/get-deps.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -1,4 +1,5 @@
 /subversion/branches/1.5.x-r30215/get-deps.sh:870312
+/subversion/branches/1.6.x-r878590/get-deps.sh:1104266-1104381
 /subversion/branches/atomic-revprop/get-deps.sh:965046-1000689
 /subversion/branches/bdb-reverse-deltas/get-deps.sh:872050-872529
 /subversion/branches/diff-callbacks3/get-deps.sh:870059-870761
@@ -52,3 +53,4 @@
 /subversion/branches/tree-conflicts/get-deps.sh:868291-873154
 /subversion/branches/tree-conflicts-notify/get-deps.sh:873926-874008
 /subversion/branches/uris-as-urls/get-deps.sh:1060426-1064427
+/subversion/trunk/get-deps.sh:878590,878607,878625-878627

Propchange: subversion/branches/1.6.x/subversion/include/private/svn_repos_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -1,5 +1,6 @@
 /subversion/branches/1.5.x-r30215/subversion/include/private/svn_repos_private.h:870312
-/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/include/private/svn_repos_private.h:1053419-1104095
+/subversion/branches/1.6.x-r878590/subversion/include/private/svn_repos_private.h:1104266-1104381
+/subversion/branches/1.6.x-svn_fs_commit_txn/subversion/include/private/svn_repos_private.h:1053419-1053427
 /subversion/branches/atomic-revprop/subversion/include/private/svn_repos_private.h:965046-1000689
 /subversion/branches/bdb-reverse-deltas/subversion/include/private/svn_repos_private.h:872050-872529
 /subversion/branches/diff-callbacks3/subversion/include/private/svn_repos_private.h:870059-870761
@@ -41,4 +42,4 @@
 /subversion/branches/tc_url_rev/subversion/include/private/svn_repos_private.h:874351-874483
 /subversion/branches/tree-conflicts/subversion/include/private/svn_repos_private.h:868291-873154
 /subversion/branches/tree-conflicts-notify/subversion/include/private/svn_repos_private.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_repos_private.h:1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053233,1053499
+/subversion/trunk/subversion/include/private/svn_repos_private.h:878590,878607,878625-878627,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053233,1053499

Propchange: subversion/branches/1.6.x/subversion/libsvn_fs_fs/rep-cache.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -58,6 +58,7 @@
 /subversion/branches/1.6.x-r39887/subversion/libsvn_fs_fs/rep-cache.c:880024-880066
 /subversion/branches/1.6.x-r40452/subversion/libsvn_fs_fs/rep-cache.c:880530-890996
 /subversion/branches/1.6.x-r877814/subversion/libsvn_fs_fs/rep-cache.c:1003097-1033216
+/subversion/branches/1.6.x-r878590/subversion/libsvn_fs_fs/rep-cache.c:1104266-1104381
 /subversion/branches/1.6.x-r879757/subversion/libsvn_fs_fs/rep-cache.c:987687-999407
 /subversion/branches/1.6.x-r880146/subversion/libsvn_fs_fs/rep-cache.c:1071612-1072350
 /subversion/branches/1.6.x-r889840/subversion/libsvn_fs_fs/rep-cache.c:889888-890974
@@ -86,7 +87,7 @@
 /subversion/branches/dont-save-plaintext-passwords-by-default/subversion/libsvn_fs_fs/rep-cache.c:870728-871118
 /subversion/branches/double-delete/subversion/libsvn_fs_fs/rep-cache.c:870511-872970
 /subversion/branches/file-externals/subversion/libsvn_fs_fs/rep-cache.c:871779-873302
-/subversion/branches/fs-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c:869036-873803
+/subversion/branches/fs-rep-sharing/subversion/libsvn_fs_fs/rep-cache.c:869036-873436
 /subversion/branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.c:873717-874575
 /subversion/branches/gnome-keyring/subversion/libsvn_fs_fs/rep-cache.c:870558-871410
 /subversion/branches/http-protocol-v2/subversion/libsvn_fs_fs/rep-cache.c:875632
@@ -113,4 +114,4 @@
 /subversion/branches/tc_url_rev/subversion/libsvn_fs_fs/rep-cache.c:874351-874483
 /subversion/branches/tree-conflicts/subversion/libsvn_fs_fs/rep-cache.c:868291-873154
 /subversion/branches/tree-conflicts-notify/subversion/libsvn_fs_fs/rep-cache.c:873926-874008
-/subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,8774
 07,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201
 ,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001
 009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1100213,1103665
+/subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,8774
 07,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148
 ,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,
 1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1100213,1103665

Modified: subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c?rev=1104382&r1=1104381&r2=1104382&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c Tue May 17 16:22:22 2011
@@ -106,7 +106,6 @@ typedef struct locate_ctx_t
 {
     const apr_strmatch_pattern *pattern;
     apr_size_t pattern_len;
-    apr_uri_t uri;
     const char *localpath;
     apr_size_t  localpath_len;
     const char *remotepath;
@@ -123,26 +122,39 @@ apr_status_t dav_svn__location_in_filter
     locate_ctx_t *ctx = f->ctx;
     apr_status_t rv;
     apr_bucket *bkt;
-    const char *master_uri;
+    const char *master_uri, *root_dir;
+    apr_uri_t uri;
 
+    /* Don't filter if we're in a subrequest or we aren't setup to
+       proxy anything. */
     master_uri = dav_svn__get_master_uri(r);
-
     if (r->main || !master_uri) {
         ap_remove_input_filter(f);
         return ap_get_brigade(f->next, bb, mode, block, readbytes);
     }
 
+    /* And don't filter if our search-n-replace would be a noop anyway
+       (that is, if our root path matches that of the master server). */
+    apr_uri_parse(r->pool, master_uri, &uri);
+    root_dir = dav_svn__get_root_dir(r);
+    if (strcmp(uri.path, root_dir) == 0) {
+        ap_remove_input_filter(f);
+        return ap_get_brigade(f->next, bb, mode, block, readbytes);
+    }
+
+    /* ### FIXME: While we want to fix up any locations in proxied XML
+       ### requests, we do *not* want to be futzing with versioned (or
+       ### to-be-versioned) data, such as the file contents present in
+       ### PUT requests and properties in PROPPATCH requests.
+       ### See issue #3445 for details. */
+
     if (!f->ctx) {
         ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
-
-        apr_uri_parse(r->pool, master_uri, &ctx->uri);
-        /* We are url encoding the current url and the master url
-           as incoming(from client) request body has it encoded already. */
-        ctx->remotepath = svn_path_uri_encode(ctx->uri.path, r->pool);
+        ctx->remotepath = svn_path_uri_encode(uri.path, r->pool);
         ctx->remotepath_len = strlen(ctx->remotepath);
-        ctx->localpath = svn_path_uri_encode(dav_svn__get_root_dir(r), r->pool);
+        ctx->localpath = svn_path_uri_encode(root_dir, r->pool);
         ctx->localpath_len = strlen(ctx->localpath);
-        ctx->pattern = apr_strmatch_precompile(r->pool, ctx->localpath, 0);
+        ctx->pattern = apr_strmatch_precompile(r->pool, ctx->localpath, 1);
         ctx->pattern_len = ctx->localpath_len;
     }
 
@@ -189,30 +201,32 @@ apr_status_t dav_svn__location_header_fi
 {
     request_rec *r = f->r;
     const char *master_uri;
+    const char *location, *start_foo = NULL;
 
+    /* Don't filter if we're in a subrequest or we aren't setup to
+       proxy anything. */
     master_uri = dav_svn__get_master_uri(r);
     master_uri = svn_path_uri_encode(master_uri, r->pool);
+    if (r->main || !master_uri) {
+        ap_remove_output_filter(f);
+        return ap_pass_brigade(f->next, bb);
+    }
 
-    if (!r->main && master_uri) {
-        const char *location, *start_foo = NULL;
-
-        location = apr_table_get(r->headers_out, "Location");
-        if (location) {
-            start_foo = ap_strstr_c(location, master_uri);
-        }
-        if (start_foo) {
-            const char *new_uri;
-            start_foo += strlen(master_uri);
-            new_uri = ap_construct_url(r->pool,
-                                       apr_pstrcat(r->pool,
-                                                   dav_svn__get_root_dir(r),
-                                                   start_foo, NULL),
-                                       r);
-            new_uri = svn_path_uri_encode(new_uri, r->pool);
-            apr_table_set(r->headers_out, "Location", new_uri);
-        }
+    location = apr_table_get(r->headers_out, "Location");
+    if (location) {
+        start_foo = ap_strstr_c(location, master_uri);
+    }
+    if (start_foo) {
+        const char *new_uri;
+        start_foo += strlen(master_uri);
+        new_uri = ap_construct_url(r->pool,
+                                   apr_pstrcat(r->pool,
+                                               dav_svn__get_root_dir(r),
+                                               start_foo, NULL),
+                                   r);
+        new_uri = svn_path_uri_encode(new_uri, r->pool);
+        apr_table_set(r->headers_out, "Location", new_uri);
     }
-    ap_remove_output_filter(f);
     return ap_pass_brigade(f->next, bb);
 }
 
@@ -222,26 +236,41 @@ apr_status_t dav_svn__location_body_filt
     request_rec *r = f->r;
     locate_ctx_t *ctx = f->ctx;
     apr_bucket *bkt;
-    const char *master_uri;
+    const char *master_uri, *root_dir;
+    apr_uri_t uri;
 
+    /* Don't filter if we're in a subrequest or we aren't setup to
+       proxy anything. */
     master_uri = dav_svn__get_master_uri(r);
-
     if (r->main || !master_uri) {
         ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, bb);
     }
 
+    /* And don't filter if our search-n-replace would be a noop anyway
+       (that is, if our root path matches that of the master server). */
+    apr_uri_parse(r->pool, master_uri, &uri);
+    root_dir = dav_svn__get_root_dir(r);
+    if (strcmp(uri.path, root_dir) == 0) {
+        ap_remove_output_filter(f);
+        return ap_pass_brigade(f->next, bb);
+    }
+
+    /* ### FIXME: GET and PROPFIND requests that make it here must be
+       ### referring to data inside commit transactions-in-progress.
+       ### We've got to be careful not to munge the versioned data
+       ### they return in the process of trying to do URI fix-ups.
+       ### See issue #3445 for details. */
+
     if (!f->ctx) {
         ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
-
-        apr_uri_parse(r->pool, master_uri, &ctx->uri);
         /* We are url encoding the current url and the master url
            as incoming (from master) request body has it encoded already. */
-        ctx->remotepath = svn_path_uri_encode(ctx->uri.path, r->pool);
+        ctx->remotepath = svn_path_uri_encode(uri.path, r->pool);
         ctx->remotepath_len = strlen(ctx->remotepath);
-        ctx->localpath = svn_path_uri_encode(dav_svn__get_root_dir(r), r->pool);
+        ctx->localpath = svn_path_uri_encode(root_dir, r->pool);
         ctx->localpath_len = strlen(ctx->localpath);
-        ctx->pattern = apr_strmatch_precompile(r->pool, ctx->remotepath, 0);
+        ctx->pattern = apr_strmatch_precompile(r->pool, ctx->remotepath, 1);
         ctx->pattern_len = ctx->remotepath_len;
     }
 

Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -56,6 +56,7 @@
 /subversion/branches/1.6.x-r39887/subversion/tests/cmdline/merge_tests.py:880024-880066
 /subversion/branches/1.6.x-r40452/subversion/tests/cmdline/merge_tests.py:880530-890996
 /subversion/branches/1.6.x-r877814/subversion/tests/cmdline/merge_tests.py:1003097-1033216
+/subversion/branches/1.6.x-r878590/subversion/tests/cmdline/merge_tests.py:1104266-1104381
 /subversion/branches/1.6.x-r879757/subversion/tests/cmdline/merge_tests.py:987687-999407
 /subversion/branches/1.6.x-r880146/subversion/tests/cmdline/merge_tests.py:1071612-1072350
 /subversion/branches/1.6.x-r889840/subversion/tests/cmdline/merge_tests.py:889888-890974
@@ -110,4 +111,4 @@
 /subversion/branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py:868291-873154
 /subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/merge_tests.py:873926-874008
 /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py:953878
-/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,
 877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,87
 9271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186,1032808,1033166,1033665,103
 3685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1086222
+/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,
 877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,87
 9170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186
 ,1032808,1033166,1033665,1033685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1086222

Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 16:22:22 2011
@@ -56,6 +56,7 @@
 /subversion/branches/1.6.x-r39887/subversion/tests/cmdline/svntest/main.py:880024-880066
 /subversion/branches/1.6.x-r40452/subversion/tests/cmdline/svntest/main.py:880530-890996
 /subversion/branches/1.6.x-r877814/subversion/tests/cmdline/svntest/main.py:1003097-1033216
+/subversion/branches/1.6.x-r878590/subversion/tests/cmdline/svntest/main.py:1104266-1104381
 /subversion/branches/1.6.x-r879757/subversion/tests/cmdline/svntest/main.py:987687-999407
 /subversion/branches/1.6.x-r880146/subversion/tests/cmdline/svntest/main.py:1071612-1072350
 /subversion/branches/1.6.x-r889840/subversion/tests/cmdline/svntest/main.py:889888-890974
@@ -110,5 +111,5 @@
 /subversion/branches/tc_url_rev/subversion/tests/cmdline/svntest/main.py:874351-874483
 /subversion/branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py:868291-873154
 /subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/svntest/main.py:873926-874008
-/subversion/trunk/subversion/tests/cmdline/svntest/main.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319
 ,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,8
 79201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,10020
 94,1005446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1086222
+/subversion/trunk/subversion/tests/cmdline/svntest/main.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319
 ,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,8
 79148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1
 000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1086222
 /subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py:991972



Mime
View raw message