You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/12/02 18:40:54 UTC
svn commit: r1041488 [1/2] - in /subversion/branches/1.5.x: ./
notes/tree-conflicts/ subversion/bindings/swig/ subversion/include/private/
subversion/libsvn_client/ subversion/libsvn_repos/ subversion/libsvn_subr/
subversion/libsvn_wc/ subversion/tests...
Author: hwright
Date: Thu Dec 2 17:40:54 2010
New Revision: 1041488
URL: http://svn.apache.org/viewvc?rev=1041488&view=rev
Log:
Merge r1032808 from trunk:
* r1032808
Fix blame -g server-side memory leaks.
Justification:
As detailed in http://svn.haxx.se/dev/archive-2010-11/0102.shtml,
blame -g can trigger a serious server side memory leak.
Votes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
Modified:
subversion/branches/1.5.x/ (props changed)
subversion/branches/1.5.x/CHANGES (props changed)
subversion/branches/1.5.x/COMMITTERS (props changed)
subversion/branches/1.5.x/STATUS
subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt (props changed)
subversion/branches/1.5.x/subversion/bindings/swig/ (props changed)
subversion/branches/1.5.x/subversion/include/private/ (props changed)
subversion/branches/1.5.x/subversion/libsvn_client/merge.c (props changed)
subversion/branches/1.5.x/subversion/libsvn_repos/rev_hunt.c
subversion/branches/1.5.x/subversion/libsvn_subr/ (props changed)
subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c (props changed)
subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py (props changed)
subversion/branches/1.5.x/www/images/subversion-diagram.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo-200x173.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo-384x332.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png (props changed)
Propchange: subversion/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -34,4 +34,4 @@
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/svn-mergeinfo-enhancements:870196
/subversion/branches/svnpatch-diff:871905
-/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985
8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671,
870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87
1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739
40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869841,869843-869844,86985
8,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,870647,870657,870665,870671,
870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,871668,871675,871677,87
1693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,8739
40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -30,4 +30,4 @@
/subversion/branches/r30963-1.5.x/CHANGES:871056-871076
/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870196
/subversion/trunk:876953
-/subversion/trunk/CHANGES:836421-841355,869155-871860,871863-872360,872362,872364-872837,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873218-873643,873715,873718,873767,873778,873849,873856,873862,873914,873920-874935,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/CHANGES:836421-841355,869155-871860,871863-872360,872362,872364-872837,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873218-873643,873715,873718,873767,873778,873849,873856,873862,873914,873920-874935,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/COMMITTERS
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -30,4 +30,4 @@
/subversion/branches/r30963-1.5.x/COMMITTERS:871056-871076
/subversion/branches/svn-mergeinfo-enhancements/COMMITTERS:870196
/subversion/trunk:876953
-/subversion/trunk/COMMITTERS:836421-842826,869164,869506,870043,870331,870681,870702,870706,870809,870820-870824,870830,870886,870989,871003,871009,871023,871033,871035-871036,871041,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-8
71942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874
727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/COMMITTERS:836421-842826,869164,869506,870043,870331,870681,870702,870706,870809,870820-870824,870830,870886,870989,871003,871009,871023,871033,871035-871036,871041,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-8
71942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874
727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041488&r1=1041487&r2=1041488&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Thu Dec 2 17:40:54 2010
@@ -194,13 +194,3 @@ Approved changes:
Votes:
+1: cmpilato, danielsh, rhuijben
-0: hwright (until such time as a backport branch exists)
-
- * r1032808
- Fix blame -g server-side memory leaks.
- Justification:
- As detailed in http://svn.haxx.se/dev/archive-2010-11/0102.shtml,
- blame -g can trigger a serious server side memory leak.
- Votes:
- +1: stsp, philip, pburba
- (For 1.6.x there was +1: pburba, cmpilato, hwright)
-
Propchange: subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -15,4 +15,4 @@
/subversion/branches/1.5.x-rb-test-fix/notes/tree-conflicts/scratch-pad.txt:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt:874586-874922
/subversion/trunk/libsvn_subr:876953
-/subversion/trunk/notes/tree-conflicts/scratch-pad.txt:836421-867527,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/notes/tree-conflicts/scratch-pad.txt:836421-867527,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/subversion/bindings/swig/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -31,4 +31,4 @@
/subversion/branches/r30963-1.5.x/subversion/bindings/swig:871056-871076
/subversion/branches/svn-mergeinfo-enhancements/subversion/bindings/swig:870196
/subversion/trunk/.x-2/.svn/dir-prop-base:876953
-/subversion/trunk/subversion/bindings/swig:836421-837142,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,8
69825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870
626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871129-871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,87167
7,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,
873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/bindings/swig:836421-837142,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,8
69825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870
626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871129-871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472,871476,871481,871489,871499,871505,871508,871538,871542,871544,871556,871559,871562-871563,871578,871581,871590,871620,871624,871649,871668,871675,87167
7,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,873856,873862,873914,
873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/subversion/include/private/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -34,4 +34,4 @@
/subversion/branches/svn-mergeinfo-enhancements/subversion/include/private:870196
/subversion/branches/svnpatch-diff/subversion/include/private:871905
/subversion/trunk/lient/merge.c:876953
-/subversion/trunk/subversion/include/private:836421-861089,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820
,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-8
70626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871
620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,87376
7,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/include/private:836421-861089,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820
,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-8
70626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871
620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,87376
7,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/subversion/libsvn_client/merge.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -33,4 +33,4 @@
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_client/merge.c:870196
/subversion/branches/svnpatch-diff/subversion/libsvn_client/merge.c:871905
/subversion/trunk:876953
-/subversion/trunk/subversion/libsvn_client/merge.c:836421-864118,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,
869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,87
0625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,8716
08,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873370,873443,873521,873538-873539,873715
,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/libsvn_client/merge.c:836421-864118,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,
869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,87
0625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,8716
08,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873370,873443,873521,873538-873539,873715
,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Modified: subversion/branches/1.5.x/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/libsvn_repos/rev_hunt.c?rev=1041488&r1=1041487&r2=1041488&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/1.5.x/subversion/libsvn_repos/rev_hunt.c Thu Dec 2 17:40:54 2010
@@ -1104,47 +1104,49 @@ find_interesting_revisions(apr_array_hea
apr_hash_t *duplicate_path_revs,
svn_repos_authz_func_t authz_read_func,
void *authz_read_baton,
- apr_pool_t *pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
- apr_pool_t *iter_pool, *last_pool;
+ apr_pool_t *iterpool, *last_pool;
svn_fs_history_t *history;
svn_fs_root_t *root;
svn_node_kind_t kind;
/* We switch betwwen two pools while looping, since we need information from
the last iteration to be available. */
- iter_pool = svn_pool_create(pool);
- last_pool = svn_pool_create(pool);
+ iterpool = svn_pool_create(result_pool);
+ last_pool = svn_pool_create(result_pool);
/* The path had better be a file in this revision. */
- SVN_ERR(svn_fs_revision_root(&root, repos->fs, end, last_pool));
- SVN_ERR(svn_fs_check_path(&kind, root, path, pool));
+ SVN_ERR(svn_fs_revision_root(&root, repos->fs, end, scratch_pool));
+ SVN_ERR(svn_fs_check_path(&kind, root, path, scratch_pool));
if (kind != svn_node_file)
return svn_error_createf
(SVN_ERR_FS_NOT_FILE, NULL, _("'%s' is not a file in revision %ld"),
path, end);
/* Open a history object. */
- SVN_ERR(svn_fs_node_history(&history, root, path, last_pool));
-
+ SVN_ERR(svn_fs_node_history(&history, root, path, scratch_pool));
while (1)
{
- struct path_revision *path_rev = apr_palloc(pool, sizeof(*path_rev));
+ struct path_revision *path_rev;
+ svn_revnum_t tmp_revnum;
+ const char *tmp_path;
apr_pool_t *tmp_pool;
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
/* Fetch the history object to walk through. */
- SVN_ERR(svn_fs_history_prev(&history, history, TRUE, iter_pool));
+ SVN_ERR(svn_fs_history_prev(&history, history, TRUE, iterpool));
if (!history)
break;
- SVN_ERR(svn_fs_history_location(&path_rev->path, &path_rev->revnum,
- history, iter_pool));
+ SVN_ERR(svn_fs_history_location(&tmp_path, &tmp_revnum,
+ history, iterpool));
/* Check to see if we already saw this path (and it's ancestors) */
if (include_merged_revisions
- && is_path_in_hash(duplicate_path_revs, path_rev->path,
- path_rev->revnum, iter_pool))
+ && is_path_in_hash(duplicate_path_revs, tmp_path,
+ tmp_revnum, iterpool))
break;
/* Check authorization. */
@@ -1153,21 +1155,24 @@ find_interesting_revisions(apr_array_hea
svn_boolean_t readable;
svn_fs_root_t *tmp_root;
- SVN_ERR(svn_fs_revision_root(&tmp_root, repos->fs, path_rev->revnum,
- iter_pool));
- SVN_ERR(authz_read_func(&readable, tmp_root, path_rev->path,
- authz_read_baton, iter_pool));
+ SVN_ERR(svn_fs_revision_root(&tmp_root, repos->fs, tmp_revnum,
+ iterpool));
+ SVN_ERR(authz_read_func(&readable, tmp_root, tmp_path,
+ authz_read_baton, iterpool));
if (! readable)
break;
}
- path_rev->path = apr_pstrdup(pool, path_rev->path);
+ /* We didn't break, so we must really want this path-rev. */
+ path_rev = apr_palloc(result_pool, sizeof(*path_rev));
+ path_rev->path = apr_pstrdup(result_pool, tmp_path);
+ path_rev->revnum = tmp_revnum;
path_rev->merged = mark_as_merged;
APR_ARRAY_PUSH(path_revisions, struct path_revision *) = path_rev;
if (include_merged_revisions)
SVN_ERR(get_merged_mergeinfo(&path_rev->merged_mergeinfo, repos,
- path_rev, pool));
+ path_rev, result_pool));
else
path_rev->merged_mergeinfo = NULL;
@@ -1175,7 +1180,7 @@ find_interesting_revisions(apr_array_hea
occurrences of it. We only care about this if including merged
revisions, 'cause that's the only time we can have duplicates. */
apr_hash_set(duplicate_path_revs,
- apr_psprintf(pool, "%s:%ld", path_rev->path,
+ apr_psprintf(result_pool, "%s:%ld", path_rev->path,
path_rev->revnum),
APR_HASH_KEY_STRING, (void *)0xdeadbeef);
@@ -1183,12 +1188,12 @@ find_interesting_revisions(apr_array_hea
break;
/* Swap pools. */
- tmp_pool = iter_pool;
- iter_pool = last_pool;
+ tmp_pool = iterpool;
+ iterpool = last_pool;
last_pool = tmp_pool;
}
- svn_pool_destroy(iter_pool);
+ svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
@@ -1216,12 +1221,12 @@ find_merged_revisions(apr_array_header_t
apr_pool_t *pool)
{
apr_array_header_t *old, *new;
- apr_pool_t *iter_pool, *last_pool;
+ apr_pool_t *iterpool, *last_pool;
apr_array_header_t *merged_path_revisions = apr_array_make(pool, 0,
sizeof(struct path_revision *));
old = mainline_path_revisions;
- iter_pool = svn_pool_create(pool);
+ iterpool = svn_pool_create(pool);
last_pool = svn_pool_create(pool);
do
@@ -1229,27 +1234,34 @@ find_merged_revisions(apr_array_header_t
int i;
apr_pool_t *temp_pool;
- svn_pool_clear(iter_pool);
- new = apr_array_make(iter_pool, 0, sizeof(struct path_revision *));
+ svn_pool_clear(iterpool);
+ new = apr_array_make(iterpool, 0, sizeof(struct path_revision *));
/* Iterate over OLD, checking for non-empty mergeinfo. If found, gather
path_revisions for any merged revisions, and store those in NEW. */
for (i = 0; i < old->nelts; i++)
{
+ apr_pool_t *iterpool2;
apr_hash_index_t *hi;
struct path_revision *old_pr = APR_ARRAY_IDX(old, i,
struct path_revision *);
if (!old_pr->merged_mergeinfo)
continue;
+ iterpool2 = svn_pool_create(iterpool);
+
/* Determine and trace the merge sources. */
- for (hi = apr_hash_first(iter_pool, old_pr->merged_mergeinfo); hi;
+ for (hi = apr_hash_first(iterpool, old_pr->merged_mergeinfo); hi;
hi = apr_hash_next(hi))
{
+ apr_pool_t *iterpool3;
apr_array_header_t *rangelist;
const char *path;
int j;
+ svn_pool_clear(iterpool2);
+ iterpool3 = svn_pool_create(iterpool2);
+
apr_hash_this(hi, (void *) &path, NULL, (void *) &rangelist);
for (j = 0; j < rangelist->nelts; j++)
@@ -1259,9 +1271,10 @@ find_merged_revisions(apr_array_header_t
svn_node_kind_t kind;
svn_fs_root_t *root;
+ svn_pool_clear(iterpool3);
SVN_ERR(svn_fs_revision_root(&root, repos->fs, range->end,
- iter_pool));
- SVN_ERR(svn_fs_check_path(&kind, root, path, iter_pool));
+ iterpool3));
+ SVN_ERR(svn_fs_check_path(&kind, root, path, iterpool3));
if (kind != svn_node_file)
continue;
@@ -1271,20 +1284,23 @@ find_merged_revisions(apr_array_header_t
TRUE, TRUE,
duplicate_path_revs,
authz_read_func,
- authz_read_baton, pool));
+ authz_read_baton, pool,
+ iterpool3));
}
+ svn_pool_destroy(iterpool3);
}
+ svn_pool_destroy(iterpool2);
}
/* Append the newly found path revisions with the old ones. */
- merged_path_revisions = apr_array_append(iter_pool, merged_path_revisions,
+ merged_path_revisions = apr_array_append(iterpool, merged_path_revisions,
new);
/* Swap data structures */
old = new;
temp_pool = last_pool;
- last_pool = iter_pool;
- iter_pool = temp_pool;
+ last_pool = iterpool;
+ iterpool = temp_pool;
}
while (new->nelts > 0);
@@ -1295,7 +1311,7 @@ find_merged_revisions(apr_array_header_t
/* Copy to the output array. */
*merged_path_revisions_out = apr_array_copy(pool, merged_path_revisions);
- svn_pool_destroy(iter_pool);
+ svn_pool_destroy(iterpool);
svn_pool_destroy(last_pool);
return SVN_NO_ERROR;
@@ -1431,7 +1447,8 @@ svn_repos_get_file_revs2(svn_repos_t *re
SVN_ERR(find_interesting_revisions(mainline_path_revisions, repos, path,
start, end, include_merged_revisions,
FALSE, duplicate_path_revs,
- authz_read_func, authz_read_baton, pool));
+ authz_read_func, authz_read_baton, pool,
+ pool));
/* If we are including merged revisions, go get those, too. */
if (include_merged_revisions)
Propchange: subversion/branches/1.5.x/subversion/libsvn_subr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -34,4 +34,4 @@
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_subr:870196
/subversion/branches/svnpatch-diff/subversion/libsvn_subr:871905
/subversion/trunk:876953
-/subversion/trunk/subversion/libsvn_subr:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869
841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,87064
7,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,
871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,87
3856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/libsvn_subr:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869837,869
841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,870641,87064
7,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,871649,
871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,873849,87
3856,873862,873914,873940,873947-873948,874124-874125,874127,874156,874170,874245,874258,874270,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -34,4 +34,4 @@
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_wc/adm_ops.c:870196
/subversion/branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c:871905
/subversion/trunk/bindings/swig:876953
-/subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,86
9837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,8706
41,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624
,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,8
73849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,86
9837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,8706
41,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624
,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,8
73849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083
Propchange: subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 17:40:54 2010
@@ -34,4 +34,4 @@
/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/svntest/actions.py:870196
/subversion/branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py:871905
/subversion/trunk:876953
-/subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869
815-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,87062
0,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,
871597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,87
3715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1033166,1038163,1041083
+/subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869
815-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,87062
0,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,
871597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,87
3715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,1022675,1032808,1033166,1038163,1041083