svn commit: r888932 - /subversion/branches/issue-3242-dev/

[cm...@apache.org]

Author: cmpilato
Date: Wed Dec  9 19:30:35 2009
New Revision: 888932

URL: http://svn.apache.org/viewvc?rev=888932&view=rev
Log:
Attempt to manually repair mergeinfo in the 'issue-3242-dev' branch
that was damaged in my last sync-up merge+commit there.  Not sure what
happened, but the committed result was quite broken.

Modified:
    subversion/branches/issue-3242-dev/   (props changed)

Propchange: subversion/branches/issue-3242-dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  9 19:30:35 2009
@@ -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:875998-880579
+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:879653-880579