You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/03/30 23:22:48 UTC
svn commit: r929295 - in /subversion/branches: 1.6.x/ 1.6.x/CHANGES
fs-successor-ids/ python-3-compatibility/
Author: pburba
Date: Tue Mar 30 21:22:48 2010
New Revision: 929295
URL: http://svn.apache.org/viewvc?rev=929295&view=rev
Log:
Fix mergeinfo on three branches that does not agree with the expected offset
of 840074 from the load of the Tigris Subversion repository into the ASF
repository.
See: http://svn.haxx.se/dev/archive-2010-03/0160.shtml
* 1.6.x
* 1.6.x/CHANGES
The original offset problem was on '/subversion/branches/1.6.x-r40452' and
'/subversion/branches/1.6.x-r40452/CHANGES', but the 1.6.x-r40452 branch
was reintegrated back to 1.6.x in r891009. To fix this, I did the
following:
1) Reverse merged the reintegration:
svn merge --ignore-ancestry -c-891009 ^/subversion/branches/1.6.x
1.6.x-WC
2) Reverted *all* but mergeinfo changes to 1.6.x and 1.6.x/CHANGES:
3) Did a record only merge of all the work done on the 1.6.x-r40452
branch:
svn merge --record-only -r880529:890996
^/subversion/branches/1.6.x-r40452@890996 1.6.x-WC
4) Did are record only merge of the revisions merged from trunk to
to the 1.6.x-r40452 branch during its lifetime:
svn merge --record-only -r880524:880526 ^^/subversion/trunk 1.6.x-WC
* fs-successor-ids
This branch still exists. The mergeinfo offset was wrong starting in
r880536 when the branch copied from trunk@880535.
To fix this, I did the following:
1) Merged the difference between the branch at the first revision it
existed and trunk at the revision the branch was copied from:
svn merge --ignore-ancestry
^/subversion/branches/fs-successor-ids@880536
^/subversion/trunk@880535 fs-successor-ids-WC
This returns the mergeinfo to that that of trunk when it was copied,
so it once again has the right offset.
This branch has never been synced with trunk, but there was a merge to
it in r880537, where r866919, r868662, and r880528 were merged from an
earlier incarnation of the branch. The mergeinfo for that merge is only
partially correct, the first two revisions *predate* the revision
(r866918) the branch was created:
subversion/branches/fs-successor-ids:863264,865007,880528
I fixed those two revisions is via a propedit.
* python-3-compatibility
Like fs-successor-ids, this branch still exists, unlike fs-successor-ids,
the mergeinfo offsets were correct when the branch was created and didn't
get corrupted until last sync from trunk to the branch in r880589. To
fix this I did the following:
1) Reverse merged only the mergeinfo changes made by r880589:
svn merge --ignore-ancestry --depth empty -c-880589
^/subversion/branches/python-3-compatibility
python-3-compatibility-WC
2) Used --record-only to create the correct sync info from trunk:
svn merge --record-only -r880499:880588 ^/subversion/trunk
python-3-compatibility-WC
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/fs-successor-ids/ (props changed)
subversion/branches/python-3-compatibility/ (props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:22:48 2010
@@ -1,33 +1,33 @@
-/subversion/branches/1.5.x-r30215:866657
+/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868
-/subversion/branches/1.6.x-UNC-paths:872816-872890
-/subversion/branches/1.6.x-dirent-basename:872475-872607
+/subversion/branches/1.6.x-UNC-paths:876471-876545
+/subversion/branches/1.6.x-dirent-basename:876130-876262
/subversion/branches/1.6.x-future-proof:880259-884209
/subversion/branches/1.6.x-issue-3242-partial:916088-923778
/subversion/branches/1.6.x-issue3020:927446-928793
/subversion/branches/1.6.x-issue3390:907042-927863
/subversion/branches/1.6.x-issue3432:878598-924025
-/subversion/branches/1.6.x-issue3443:874942-875825
+/subversion/branches/1.6.x-issue3443:878597-879480
/subversion/branches/1.6.x-issue3519:880376-889934
/subversion/branches/1.6.x-issue3573:906488-923765
/subversion/branches/1.6.x-issue3605:923668-923887
-/subversion/branches/1.6.x-no-svn_uri:872705-872760
-/subversion/branches/1.6.x-r36178:874221-874229
-/subversion/branches/1.6.x-r36252:872673-873133
-/subversion/branches/1.6.x-r37622:874044-874338
-/subversion/branches/1.6.x-r37627:874049-874273
-/subversion/branches/1.6.x-r37857:874277-874281
-/subversion/branches/1.6.x-r37953:876154-876416
-/subversion/branches/1.6.x-r37988:874408-875242
-/subversion/branches/1.6.x-r38000:875428-876112
-/subversion/branches/1.6.x-r38222:874644-875236
-/subversion/branches/1.6.x-r38572:875006-875011
-/subversion/branches/1.6.x-r38799:875225-875262
-/subversion/branches/1.6.x-r38927:875347-875521
+/subversion/branches/1.6.x-no-svn_uri:876360-876415
+/subversion/branches/1.6.x-r36178:877876-877884
+/subversion/branches/1.6.x-r36252:876328-876788
+/subversion/branches/1.6.x-r37622:877699-877993
+/subversion/branches/1.6.x-r37627:877704-877928
+/subversion/branches/1.6.x-r37857:877932-877936
+/subversion/branches/1.6.x-r37953:879809-880071
+/subversion/branches/1.6.x-r37988:878063-878897
+/subversion/branches/1.6.x-r38000:879083-879767
+/subversion/branches/1.6.x-r38222:878299-878891
+/subversion/branches/1.6.x-r38572:878661-878666
+/subversion/branches/1.6.x-r38799:878880-878917
+/subversion/branches/1.6.x-r38927:879002-879176
/subversion/branches/1.6.x-r39019:879132-895676
/subversion/branches/1.6.x-r39109:879131
-/subversion/branches/1.6.x-r39557:876013-876252
-/subversion/branches/1.6.x-r39887:876369-876411
+/subversion/branches/1.6.x-r39557:879668-879907
+/subversion/branches/1.6.x-r39887:880024-880066
/subversion/branches/1.6.x-r40452:880530-890996
/subversion/branches/1.6.x-r889840:889888-890974
/subversion/branches/1.6.x-r891672:891676-923748
@@ -36,34 +36,34 @@
/subversion/branches/1.6.x-r898963:899874-915098
/subversion/branches/1.6.x-r905326:905545-923537
/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
-/subversion/branches/bdb-reverse-deltas:868395-868874
-/subversion/branches/diff-callbacks3:866404-867106
-/subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463
-/subversion/branches/double-delete:866856-869315
-/subversion/branches/file-externals:868124-869647
-/subversion/branches/fs-rep-sharing:865381-870148
-/subversion/branches/fsfs-pack:870062-870920
-/subversion/branches/gnome-keyring:866903-867755
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
/subversion/branches/http-protocol-v2:875632
-/subversion/branches/in-memory-cache:866174-867797
-/subversion/branches/issue-2843-dev:867777-870524
-/subversion/branches/issue-3000:868058,868061-868064,868066-868071,868073,868079
-/subversion/branches/issue-3067-deleted-subtrees:869720-870429
-/subversion/branches/issue-3148-dev:871538-871549
-/subversion/branches/issue-3220-dev:868555-868571
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
/subversion/branches/issue-3242-dev:879762,880472,880579
-/subversion/branches/issue-3334-dirs:871501-872212
-/subversion/branches/kwallet:867130-867659
-/subversion/branches/log-g-performance:867286-867377
-/subversion/branches/merge-skips-obstructions:870870-870960
-/subversion/branches/reintegrate-improvements:870198-870509
-/subversion/branches/svn-mergeinfo-enhancements:866464-866540,866542-866633
-/subversion/branches/svnpatch-diff:868250,868331
-/subversion/branches/svnserve-logging:866173-867238
-/subversion/branches/tc-issue-3334:871042-871118
-/subversion/branches/tc-merge-notify:870362-870407
-/subversion/branches/tc-resolve:870536-870584
-/subversion/branches/tc_url_rev:870696-870828
-/subversion/branches/tree-conflicts:864636-869499
-/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877016,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,921453,922516,927184,927243,927323,927328
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff:871905,871986
+/subversion/branches/svnserve-logging:869828-870893
+/subversion/branches/tc-issue-3334:874697-874773
+/subversion/branches/tc-merge-notify:874017-874062
+/subversion/branches/tc-resolve:874191-874239
+/subversion/branches/tc_url_rev:874351-874483
+/subversion/branches/tree-conflicts:868291-873154
+/subversion/branches/tree-conflicts-notify:873926-874008
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,87757
3,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879954,879961,880082,
880095,880105,880162,880226,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898963,899826,899828,900797,901752,902093,904301,904394,904594,905303,905326,906256,906305,917640,918211,921453,922516,927184,927243,927323,927328
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:22:48 2010
@@ -1,33 +1,33 @@
-/subversion/branches/1.5.x-r30215/CHANGES:866657
+/subversion/branches/1.5.x-r30215/CHANGES:870312
/subversion/branches/1.6.x-1.6.8-serfassertion/CHANGES:900822-900868
-/subversion/branches/1.6.x-UNC-paths/CHANGES:872816-872890
-/subversion/branches/1.6.x-dirent-basename/CHANGES:872475-872607
+/subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
+/subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
/subversion/branches/1.6.x-future-proof/CHANGES:880259-884209
/subversion/branches/1.6.x-issue-3242-partial/CHANGES:916088-923778
/subversion/branches/1.6.x-issue3020/CHANGES:927446-928793
/subversion/branches/1.6.x-issue3390/CHANGES:907042-927863
/subversion/branches/1.6.x-issue3432/CHANGES:878598-924025
-/subversion/branches/1.6.x-issue3443/CHANGES:874942-875825
+/subversion/branches/1.6.x-issue3443/CHANGES:878597-879480
/subversion/branches/1.6.x-issue3519/CHANGES:880376-889934
/subversion/branches/1.6.x-issue3573/CHANGES:906488-923765
/subversion/branches/1.6.x-issue3605/CHANGES:923668-923887
-/subversion/branches/1.6.x-no-svn_uri/CHANGES:872705-872760
-/subversion/branches/1.6.x-r36178/CHANGES:874221-874229
-/subversion/branches/1.6.x-r36252/CHANGES:872673-873133
-/subversion/branches/1.6.x-r37622/CHANGES:874044-874338
-/subversion/branches/1.6.x-r37627/CHANGES:874049-874273
-/subversion/branches/1.6.x-r37857/CHANGES:874277-874281
-/subversion/branches/1.6.x-r37953/CHANGES:876154-876416
-/subversion/branches/1.6.x-r37988/CHANGES:874408-875242
-/subversion/branches/1.6.x-r38000/CHANGES:875428-876112
-/subversion/branches/1.6.x-r38222/CHANGES:874644-875236
-/subversion/branches/1.6.x-r38572/CHANGES:875006-875011
-/subversion/branches/1.6.x-r38799/CHANGES:875225-875262
-/subversion/branches/1.6.x-r38927/CHANGES:875347-875521
+/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
+/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
+/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
+/subversion/branches/1.6.x-r37622/CHANGES:877699-877993
+/subversion/branches/1.6.x-r37627/CHANGES:877704-877928
+/subversion/branches/1.6.x-r37857/CHANGES:877932-877936
+/subversion/branches/1.6.x-r37953/CHANGES:879809-880071
+/subversion/branches/1.6.x-r37988/CHANGES:878063-878897
+/subversion/branches/1.6.x-r38000/CHANGES:879083-879767
+/subversion/branches/1.6.x-r38222/CHANGES:878299-878891
+/subversion/branches/1.6.x-r38572/CHANGES:878661-878666
+/subversion/branches/1.6.x-r38799/CHANGES:878880-878917
+/subversion/branches/1.6.x-r38927/CHANGES:879002-879176
/subversion/branches/1.6.x-r39019/CHANGES:879132-895676
/subversion/branches/1.6.x-r39109/CHANGES:879131
-/subversion/branches/1.6.x-r39557/CHANGES:876013-876252
-/subversion/branches/1.6.x-r39887/CHANGES:876369-876411
+/subversion/branches/1.6.x-r39557/CHANGES:879668-879907
+/subversion/branches/1.6.x-r39887/CHANGES:880024-880066
/subversion/branches/1.6.x-r40452/CHANGES:880530-890996
/subversion/branches/1.6.x-r889840/CHANGES:889888-890974
/subversion/branches/1.6.x-r891672/CHANGES:891676-923748
@@ -36,33 +36,33 @@
/subversion/branches/1.6.x-r898963/CHANGES:899874-915098
/subversion/branches/1.6.x-r905326/CHANGES:905545-923537
/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
-/subversion/branches/bdb-reverse-deltas/CHANGES:868395-868874
-/subversion/branches/diff-callbacks3/CHANGES:866404-867106
-/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:867073-867463
-/subversion/branches/double-delete/CHANGES:866856-869315
-/subversion/branches/file-externals/CHANGES:868124-869647
-/subversion/branches/fs-rep-sharing/CHANGES:865381-870148
-/subversion/branches/fsfs-pack/CHANGES:870062-870920
-/subversion/branches/gnome-keyring/CHANGES:866903-867755
-/subversion/branches/in-memory-cache/CHANGES:866174-867797
-/subversion/branches/issue-2843-dev/CHANGES:867777-870524
-/subversion/branches/issue-3000/CHANGES:868058,868061-868064,868066-868071,868073,868079
-/subversion/branches/issue-3067-deleted-subtrees/CHANGES:869720-870429
-/subversion/branches/issue-3148-dev/CHANGES:871538-871549
-/subversion/branches/issue-3220-dev/CHANGES:868555-868571
+/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
+/subversion/branches/diff-callbacks3/CHANGES:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
+/subversion/branches/double-delete/CHANGES:870511-872970
+/subversion/branches/file-externals/CHANGES:871779-873302
+/subversion/branches/fs-rep-sharing/CHANGES:869036-873803
+/subversion/branches/fsfs-pack/CHANGES:873717-874575
+/subversion/branches/gnome-keyring/CHANGES:870558-871410
+/subversion/branches/in-memory-cache/CHANGES:869829-871452
+/subversion/branches/issue-2843-dev/CHANGES:871432-874179
+/subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/CHANGES:873375-874084
+/subversion/branches/issue-3148-dev/CHANGES:875193-875204
+/subversion/branches/issue-3220-dev/CHANGES:872210-872226
/subversion/branches/issue-3242-dev/CHANGES:879762,880472,880579
-/subversion/branches/issue-3334-dirs/CHANGES:871501-872212
-/subversion/branches/kwallet/CHANGES:867130-867659
-/subversion/branches/log-g-performance/CHANGES:867286-867377
-/subversion/branches/merge-skips-obstructions/CHANGES:870870-870960
-/subversion/branches/reintegrate-improvements/CHANGES:870198-870509
-/subversion/branches/svn-mergeinfo-enhancements/CHANGES:866464-866540,866542-866633
-/subversion/branches/svnpatch-diff/CHANGES:868250,868331
-/subversion/branches/svnserve-logging/CHANGES:866173-867238
-/subversion/branches/tc-issue-3334/CHANGES:871042-871118
-/subversion/branches/tc-merge-notify/CHANGES:870362-870407
-/subversion/branches/tc-resolve/CHANGES:870536-870584
-/subversion/branches/tc_url_rev/CHANGES:870696-870828
-/subversion/branches/tree-conflicts/CHANGES:864636-869499
-/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,921453,922516,927184,927243,927323,927328
+/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
+/subversion/branches/kwallet/CHANGES:870785-871314
+/subversion/branches/log-g-performance/CHANGES:870941-871032
+/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
+/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff/CHANGES:871905,871986
+/subversion/branches/svnserve-logging/CHANGES:869828-870893
+/subversion/branches/tc-issue-3334/CHANGES:874697-874773
+/subversion/branches/tc-merge-notify/CHANGES:874017-874062
+/subversion/branches/tc-resolve/CHANGES:874191-874239
+/subversion/branches/tc_url_rev/CHANGES:874351-874483
+/subversion/branches/tree-conflicts/CHANGES:868291-873154
+/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
+/subversion/trunk/CHANGES:837701-841355,875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,921453,922516,927184,927243,927323,927328
Propchange: subversion/branches/fs-successor-ids/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:22:48 2010
@@ -1,35 +1,35 @@
-subversion/branches/1.5.x-r30215:866657
-subversion/branches/bdb-reverse-deltas:868395-868874
-subversion/branches/diff-callbacks3:866404-867106
-subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463
-subversion/branches/double-delete:866856-869315
-subversion/branches/explore-wc:871831,871838,871842,871852,871856,871859,871904,871925-871926,871929,871932,871956,871972,871992,872012-872013,872056-872057,872078-872079,872081,872089-872093,872096,872103,872127,872140-872141,872175,872181,872183,872187,872197,872200,872209,872215,872218,872225,872230-872233,872235,872242-872243,872250,872252-872254,872280,872288-872289,872291,872324,872327-872328,872330-872331,872335,872342
-subversion/branches/file-externals:868124-869647
-subversion/branches/fs-rep-sharing:865381-870148
-subversion/branches/fs-successor-ids:863264,865007,880528
-subversion/branches/fsfs-pack:870062-870920
-subversion/branches/gnome-keyring:866903-867755
-subversion/branches/http-protocol-v2:870740-872386
-subversion/branches/in-memory-cache:866174-867797
-subversion/branches/issue-2843-dev:867777-870524
-subversion/branches/issue-3000:868058,868061-868064,868066-868071,868073,868079
-subversion/branches/issue-3067-deleted-subtrees:869720-870429
-subversion/branches/issue-3148-dev:871538-871549
-subversion/branches/issue-3220-dev:868555-868571
-subversion/branches/issue-3334-dirs:871501-872212
-subversion/branches/kwallet:867130-867659
-subversion/branches/log-g-performance:867286-867377
-subversion/branches/merge-skips-obstructions:870870-870960
-subversion/branches/ra_serf-digest-authn:872038-872749
-subversion/branches/reintegrate-improvements:870198-870509
-subversion/branches/subtree-mergeinfo:873079-875111
-subversion/branches/svn-mergeinfo-enhancements:866464-866540,866542-866633
-subversion/branches/svnpatch-diff:862083-872822
-subversion/branches/svnraisetc:871054-871494
-subversion/branches/svnserve-logging:866173-867238
-subversion/branches/tc-issue-3334:871042-871118
-subversion/branches/tc-merge-notify:870362-870407
-subversion/branches/tc-resolve:870536-870584
-subversion/branches/tc_url_rev:870696-870828
-subversion/branches/tree-conflicts:864636-869499
-subversion/branches/tree-conflicts-notify:870271-870353
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fs-successor-ids:866919,868662,880528
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/ra_serf-digest-authn:875693-876404
+/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/subtree-mergeinfo:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff:865738-876477
+/subversion/branches/svnraisetc:874709-875149
+/subversion/branches/svnserve-logging:869828-870893
+/subversion/branches/tc-issue-3334:874697-874773
+/subversion/branches/tc-merge-notify:874017-874062
+/subversion/branches/tc-resolve:874191-874239
+/subversion/branches/tc_url_rev:874351-874483
+/subversion/branches/tree-conflicts:868291-873154
+/subversion/branches/tree-conflicts-notify:873926-874008
Propchange: subversion/branches/python-3-compatibility/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:22:48 2010
@@ -1,35 +1,35 @@
-subversion/branches/1.5.x-r30215:866657
-subversion/branches/bdb-reverse-deltas:868395-868874
-subversion/branches/diff-callbacks3:866404-867106
-subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463
-subversion/branches/double-delete:866856-869315
-subversion/branches/explore-wc:871831,871838,871842,871852,871856,871859,871904,871925-871926,871929,871932,871956,871972,871992,872012-872013,872056-872057,872078-872079,872081,872089-872093,872096,872103,872127,872140-872141,872175,872181,872183,872187,872197,872200,872209,872215,872218,872225,872230-872233,872235,872242-872243,872250,872252-872254,872280,872288-872289,872291,872324,872327-872328,872330-872331,872335,872342
-subversion/branches/file-externals:868124-869647
-subversion/branches/fs-rep-sharing:865381-870148
-subversion/branches/fsfs-pack:870062-870920
-subversion/branches/gnome-keyring:866903-867755
-subversion/branches/http-protocol-v2:870740-872386
-subversion/branches/in-memory-cache:866174-867797
-subversion/branches/issue-2843-dev:867777-870524
-subversion/branches/issue-3000:868058,868061-868064,868066-868071,868073,868079
-subversion/branches/issue-3067-deleted-subtrees:869720-870429
-subversion/branches/issue-3148-dev:871538-871549
-subversion/branches/issue-3220-dev:868555-868571
-subversion/branches/issue-3334-dirs:871501-872212
-subversion/branches/kwallet:867130-867659
-subversion/branches/log-g-performance:867286-867377
-subversion/branches/merge-skips-obstructions:870870-870960
-subversion/branches/ra_serf-digest-authn:872038-872749
-subversion/branches/reintegrate-improvements:870198-870509
-subversion/branches/subtree-mergeinfo:873079-875111
-subversion/branches/svn-mergeinfo-enhancements:866464-866540,866542-866633
-subversion/branches/svnpatch-diff:862083-872822
-subversion/branches/svnraisetc:871054-871494
-subversion/branches/svnserve-logging:866173-867238
-subversion/branches/tc-issue-3334:871042-871118
-subversion/branches/tc-merge-notify:870362-870407
-subversion/branches/tc-resolve:870536-870584
-subversion/branches/tc_url_rev:870696-870828
-subversion/branches/tree-conflicts:864636-869499
-subversion/branches/tree-conflicts-notify:870271-870353
-subversion/trunk:871419-880588
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/ra_serf-digest-authn:875693-876404
+/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/subtree-mergeinfo:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff:865738-876477
+/subversion/branches/svnraisetc:874709-875149
+/subversion/branches/svnserve-logging:869828-870893
+/subversion/branches/tc-issue-3334:874697-874773
+/subversion/branches/tc-merge-notify:874017-874062
+/subversion/branches/tc-resolve:874191-874239
+/subversion/branches/tc_url_rev:874351-874483
+/subversion/branches/tree-conflicts:868291-873154
+/subversion/branches/tree-conflicts-notify:873926-874008
+/subversion/trunk:875074-880588