subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1041483 [1/2] - in /subversion/branches/1.5.x: ./ notes/tree-conflicts/ subversion/bindings/swig/ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/tests/cmdline/ subversion/test...
Date Thu, 02 Dec 2010 17:37:48 GMT
Author: hwright
Date: Thu Dec  2 17:37:48 2010
New Revision: 1041483

URL: http://svn.apache.org/viewvc?rev=1041483&view=rev
Log:
Reintegrate the 1.5.x-r36775 branch:

 * r876804, r876840, r876849
   Fix issue #3383 'Foreign repository merge can add mergeinfo from the
   foreign repos'
   Justification:
     At best this mergeinfo refers to non-existent paths in the target's
     repos.  At worst the mergeinfo intersects with actual path/revisions
     in the merge target.  The latter might cause real problems, making it
     appear merges have been done that actually have not or vice-versa.
   Notes:
     r876849 is the fix, the other revisions are expansion of an existing
     merge test to cover this issue.  There are some minor conflicts, a
     backport branch can be found at ^subversion/branches/1.5.x-r36775.
   Votes:
     +1: pburba, arfrever, cmpilato

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   (contents, props changed)
    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/merge_tests.py
    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:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566:875648-876172
 /subversion/branches/1.5.x-r36256:876332-877824
 /subversion/branches/1.5.x-r36613:876709-877827
+/subversion/branches/1.5.x-r36775:876850-1041482
 /subversion/branches/1.5.x-r36879:876973-877829
 /subversion/branches/1.5.x-r36919:876996-877831
 /subversion/branches/1.5.x-r37156:877275-878306
@@ -32,4 +33,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,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566/CHANGES:875648-876172
 /subversion/branches/1.5.x-r36256/CHANGES:876332-877824
 /subversion/branches/1.5.x-r36613/CHANGES:876709-877827
+/subversion/branches/1.5.x-r36775/CHANGES:876850-1041482
 /subversion/branches/1.5.x-r36879/CHANGES:876973-877829
 /subversion/branches/1.5.x-r36919/CHANGES:876996-877831
 /subversion/branches/1.5.x-r37156/CHANGES:877275-878306
@@ -29,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/COMMITTERS
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566/COMMITTERS:875648-876172
 /subversion/branches/1.5.x-r36256/COMMITTERS:876332-877824
 /subversion/branches/1.5.x-r36613/COMMITTERS:876709-877827
+/subversion/branches/1.5.x-r36775/COMMITTERS:876850-1041482
 /subversion/branches/1.5.x-r36879/COMMITTERS:876973-877829
 /subversion/branches/1.5.x-r36919/COMMITTERS:876996-877831
 /subversion/branches/1.5.x-r37156/COMMITTERS:877275-878306
@@ -29,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,880450,1000038,1000060,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,1033166,1038163,1041083

Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041483&r1=1041482&r2=1041483&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Thu Dec  2 17:37:48 2010
@@ -183,21 +183,6 @@ Candidate changes for 1.5.9:
 Approved changes:
 =================
 
- * r876804, r876840, r876849
-   Fix issue #3383 'Foreign repository merge can add mergeinfo from the
-   foreign repos'
-   Justification:
-     At best this mergeinfo refers to non-existent paths in the target's
-     repos.  At worst the mergeinfo intersects with actual path/revisions
-     in the merge target.  The latter might cause real problems, making it
-     appear merges have been done that actually have not or vice-versa.
-   Notes:
-     r876849 is the fix, the other revisions are expansion of an existing
-     merge test to cover this issue.  There are some minor conflicts, a
-     backport branch can be found at ^subversion/branches/1.5.x-r36775.
-   Votes:
-     +1: pburba, arfrever, cmpilato
-
  * r876925, r876931
    'svnadmin upgrade'-ing pre-1.2 repositories fails for lack of
    'db/format' file.

Propchange: subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -7,6 +7,7 @@
 /subversion/branches/1.5.x-r35566/notes/tree-conflicts/scratch-pad.txt:875648-876172
 /subversion/branches/1.5.x-r36256/notes/tree-conflicts/scratch-pad.txt:876332-877824
 /subversion/branches/1.5.x-r36613/notes/tree-conflicts/scratch-pad.txt:876709-877827
+/subversion/branches/1.5.x-r36775/notes/tree-conflicts/scratch-pad.txt:876850-1041482
 /subversion/branches/1.5.x-r36879/notes/tree-conflicts/scratch-pad.txt:876973-877829
 /subversion/branches/1.5.x-r36919/notes/tree-conflicts/scratch-pad.txt:876996-877831
 /subversion/branches/1.5.x-r37156/notes/tree-conflicts/scratch-pad.txt:877275-878306
@@ -14,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/subversion/bindings/swig/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566/subversion/bindings/swig:875648-876172
 /subversion/branches/1.5.x-r36256/subversion/bindings/swig:876332-877824
 /subversion/branches/1.5.x-r36613/subversion/bindings/swig:876709-877827
+/subversion/branches/1.5.x-r36775/subversion/bindings/swig:876850-1041482
 /subversion/branches/1.5.x-r36879/subversion/bindings/swig:876973-877829
 /subversion/branches/1.5.x-r36919/subversion/bindings/swig:876996-877831
 /subversion/branches/1.5.x-r37156/subversion/bindings/swig:877275-878306
@@ -30,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/subversion/include/private/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -19,6 +19,7 @@
 /subversion/branches/1.5.x-r35566/subversion/include/private:875648-876172
 /subversion/branches/1.5.x-r36256/subversion/include/private:876332-877824
 /subversion/branches/1.5.x-r36613/subversion/include/private:876709-877827
+/subversion/branches/1.5.x-r36775/subversion/include/private:876850-1041482
 /subversion/branches/1.5.x-r36879/subversion/include/private:876973-877829
 /subversion/branches/1.5.x-r36919/subversion/include/private:876996-877831
 /subversion/branches/1.5.x-r37156/subversion/include/private:877275-878306
@@ -33,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Modified: subversion/branches/1.5.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/libsvn_client/merge.c?rev=1041483&r1=1041482&r2=1041483&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.5.x/subversion/libsvn_client/merge.c Thu Dec  2 17:37:48 2010
@@ -434,20 +434,27 @@ split_mergeinfo_on_revision(svn_mergeinf
 }
 
 
-/* Helper for merge_props_changed().  Filter out mergeinfo property additions
-   to PATH when those additions refer to the same line of history as PATH.
+/* Helper for merge_props_changed().
 
    *PROPS is an array of svn_prop_t structures representing regular properties
    to be added to the working copy PATH.  ADM_ACCESS and MERGE_B are cascaded
    from the arguments of the same name in merge_props_changed().
    
-   If mergeinfo is not being honored, do nothing.  Otherwise examine the added
-   mergeinfo, looking at each range (or single rev) of each source path.  If a
-   source_path/range refers to the same line of history as PATH (pegged at its
-   base revision), then filter out that range.  If the entire rangelist for a
-   given path is filtered then filter out the path as well.  Set outgoing
-   *PROPS to a shallow copy (allocated in POOL) of incoming *PROPS minus the
-   filtered self-referential mergeinfo. */
+   If mergeinfo is not being honored and MERGE_B->SAME_REPOS is true, do
+   nothing.  If MERGE_B->SAME_REPOS is false then filter out all mergeinfo
+   property additions (Issue #3383) from *PROPS.  If MERGE_B->SAME_REPOS is
+   true then filter out mergeinfo property additions to PATH when those
+   additions refer to the same line of history as PATH as described below.  
+
+   If mergeinfo is being honored and MERGE_B->SAME_REPOS is true
+   then examine the added mergeinfo, looking at each range (or single rev)
+   of each source path.  If a source_path/range refers to the same line of
+   history as PATH (pegged at its base revision), then filter out that range.
+   If the entire rangelist for a given path is filtered then filter out the
+   path as well.
+
+   If any filtering occurs, set outgoing *PROPS to a shallow copy (allocated
+   in POOL) of incoming *PROPS minus the filtered mergeinfo. */
 static svn_error_t*
 filter_self_referential_mergeinfo(apr_array_header_t **props,
                                    const char *path,
@@ -460,16 +467,19 @@ filter_self_referential_mergeinfo(apr_ar
   int i;
   const svn_wc_entry_t *target_entry;
 
-  /* If we aren't honoring mergeinfo, get outta here. */
+  /* If we aren't honoring mergeinfo and this is a merge from the
+     same repository, then get outta here. */
   mergeinfo_behavior(&honor_mergeinfo, NULL, merge_b);
-  if (! honor_mergeinfo)
+  if (! honor_mergeinfo && merge_b->same_repos)
     return SVN_NO_ERROR;
 
-  /* If PATH itself is newly added there is no need to filter. */
+  /* If this is a merge from the same repository and PATH itself is
+     newly added or replaced there is no need to filter. */
   SVN_ERR(svn_wc__entry_versioned(&target_entry, path, adm_access,
                                   FALSE, pool));
-  if (target_entry->schedule == svn_wc_schedule_add
-      || target_entry->schedule == svn_wc_schedule_replace)
+  if (merge_b->same_repos
+      && (target_entry->schedule == svn_wc_schedule_add
+          || target_entry->schedule == svn_wc_schedule_replace))
     return SVN_NO_ERROR;
 
   adjusted_props = apr_array_make(pool, (*props)->nelts, sizeof(svn_prop_t));
@@ -477,12 +487,20 @@ filter_self_referential_mergeinfo(apr_ar
     {
       svn_prop_t *prop = &APR_ARRAY_IDX((*props), i, svn_prop_t);
 
-      /* If this property isn't mergeinfo or is NULL valued (i.e. prop removal)
+      /* If this is a merge from a foreign repository we must strip all
+         incoming mergeinfo (including mergeinfo deletions).  Otherwise if
+         this property isn't mergeinfo or is NULL valued (i.e. prop removal)
          or empty mergeinfo it does not require any special handling.  There
          is nothing to filter out of empty mergeinfo and the concept of
          filtering doesn't apply if we are trying to remove mergeinfo
          entirely. */
-      if ((strcmp(prop->name, SVN_PROP_MERGEINFO) != 0)
+      if ((strcmp(prop->name, SVN_PROP_MERGEINFO) == 0)
+          && (! merge_b->same_repos))
+        {
+          /* Issue #3383: We don't want mergeinfo from a foreign repos. */
+          continue;
+        }
+      else if ((strcmp(prop->name, SVN_PROP_MERGEINFO) != 0)
           || (! prop->value)       /* Removal of mergeinfo */
           || (! prop->value->len)) /* Empty mergeinfo */
         {
@@ -1106,6 +1124,11 @@ merge_file_added(svn_wc_adm_access_t *ad
           && (svn_property_kind(NULL, prop->name) != svn_prop_regular_kind))
         continue;
 
+      /* Issue #3383: We don't want mergeinfo from a foreign repository. */
+      if ((! merge_b->same_repos)
+          && strcmp(prop->name, SVN_PROP_MERGEINFO) == 0)
+        continue;
+
       apr_hash_set(new_props, prop->name, APR_HASH_KEY_STRING, prop->value);
     }
 

Propchange: subversion/branches/1.5.x/subversion/libsvn_client/merge.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566/subversion/libsvn_client/merge.c:875648-876172
 /subversion/branches/1.5.x-r36256/subversion/libsvn_client/merge.c:876332-877824
 /subversion/branches/1.5.x-r36613/subversion/libsvn_client/merge.c:876709-877827
+/subversion/branches/1.5.x-r36775/subversion/libsvn_client/merge.c:876850-1041482
 /subversion/branches/1.5.x-r36879/subversion/libsvn_client/merge.c:876973-877829
 /subversion/branches/1.5.x-r36919/subversion/libsvn_client/merge.c:876996-877831
 /subversion/branches/1.5.x-r37156/subversion/libsvn_client/merge.c:877275-878306
@@ -32,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/subversion/libsvn_subr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -19,6 +19,7 @@
 /subversion/branches/1.5.x-r35566/subversion/libsvn_subr:875648-876172
 /subversion/branches/1.5.x-r36256/subversion/libsvn_subr:876332-877824
 /subversion/branches/1.5.x-r36613/subversion/libsvn_subr:876709-877827
+/subversion/branches/1.5.x-r36775/subversion/libsvn_subr:876850-1041482
 /subversion/branches/1.5.x-r36879/subversion/libsvn_subr:876973-877829
 /subversion/branches/1.5.x-r36919/subversion/libsvn_subr:876996-877831
 /subversion/branches/1.5.x-r37156/subversion/libsvn_subr:877275-878306
@@ -33,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Propchange: subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  2 17:37:48 2010
@@ -18,6 +18,7 @@
 /subversion/branches/1.5.x-r35566/subversion/libsvn_wc/adm_ops.c:875648-876172
 /subversion/branches/1.5.x-r36256/subversion/libsvn_wc/adm_ops.c:876332-877824
 /subversion/branches/1.5.x-r36613/subversion/libsvn_wc/adm_ops.c:876709-877827
+/subversion/branches/1.5.x-r36775/subversion/libsvn_wc/adm_ops.c:876850-1041482
 /subversion/branches/1.5.x-r36879/subversion/libsvn_wc/adm_ops.c:876973-877829
 /subversion/branches/1.5.x-r36919/subversion/libsvn_wc/adm_ops.c:876996-877831
 /subversion/branches/1.5.x-r37156/subversion/libsvn_wc/adm_ops.c:877275-878306
@@ -33,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,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060,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,1033166,1038163,1041083

Modified: subversion/branches/1.5.x/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/tests/cmdline/merge_tests.py?rev=1041483&r1=1041482&r2=1041483&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.5.x/subversion/tests/cmdline/merge_tests.py Thu Dec  2 17:37:48 2010
@@ -6496,15 +6496,18 @@ def prop_add_to_child_with_mergeinfo(sbo
 def foreign_repos_does_not_update_mergeinfo(sbox):
   "set no mergeinfo when merging from foreign repos"
 
-  # Test for issue #2788.
+  # Test for issue #2788 and issue #3383.
 
   sbox.build()
   wc_dir = sbox.wc_dir
   expected_disk, expected_status = set_up_branch(sbox)
 
+  # Set up for test of issue #2788.
+
   # Create a second repository with the same greek tree
   repo_dir = sbox.repo_dir
   other_repo_dir, other_repo_url = sbox.add_repo_path("other")
+  other_wc_dir = sbox.add_wc_path("other")
   svntest.main.copy_repos(repo_dir, other_repo_dir, 6, 1)
 
   # Merge r3:4 (using implied peg revisions) from 'other' repos into
@@ -6547,6 +6550,68 @@ def foreign_repos_does_not_update_mergei
   expected_status.tweak('A_COPY/D/G/rho', 'A_COPY/B/E/beta', status='M ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
+  # Set up for test of issue #3383.
+  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+
+  # Get a working copy for the foreign repos.  
+  svntest.actions.run_and_verify_svn(None, None, [], 'co', other_repo_url,
+                                     other_wc_dir)
+
+  # Create mergeinfo on the foreign repos on an existing directory and
+  # file and an added directory and file.  Commit as r7.  And no, we aren't
+  # checking these intermediate steps very thoroughly, but we test these
+  # simple merges to *death* elsewhere.
+
+  # Create mergeinfo on an existing directory.
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+                                     other_repo_url + '/A',
+                                     os.path.join(other_wc_dir, 'A_COPY'),
+                                     '-c5')
+
+  # Create mergeinfo on an existing file.
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+                                     other_repo_url + '/A/D/H/psi',
+                                     os.path.join(other_wc_dir, 'A_COPY',
+                                                  'D', 'H', 'psi'),
+                                     '-c3')
+
+  # Add a new directory with mergeinfo in the foreign repos.
+  new_dir = os.path.join(other_wc_dir, 'A_COPY', 'N')
+  svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', new_dir)
+  svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+                                     SVN_PROP_MERGEINFO, '', new_dir)
+
+  # Add a new file with mergeinfo in the foreign repos.
+  new_file = os.path.join(other_wc_dir, 'A_COPY', 'nu')
+  svntest.main.file_write(new_file, "This is the file 'nu'.\n")
+  svntest.actions.run_and_verify_svn(None, None, [], 'add', new_file)
+  svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+                                     SVN_PROP_MERGEINFO, '', new_file)
+
+  expected_output = wc.State(other_wc_dir,{
+    'A_COPY'          : Item(verb='Sending'), # Mergeinfo created
+    'A_COPY/B/E/beta' : Item(verb='Sending'),
+    'A_COPY/D/H/psi'  : Item(verb='Sending'), # Mergeinfo created
+    'A_COPY/N'        : Item(verb='Adding'),  # Has empty mergeinfo
+    'A_COPY/nu'       : Item(verb='Adding'),  # Has empty mergeinfo
+    })
+  svntest.actions.run_and_verify_commit(other_wc_dir, expected_output,
+                                        None, None, other_wc_dir,
+                                        '-m',
+                                        'create mergeinfo on foreign repos')
+  # Now merge a diff from the foreign repos that contains the mergeinfo
+  # addition in r7 to A_COPY.  The mergeinfo diff should *not* be applied
+  # to A_COPY since it refers to a foreign repository...
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+                                     other_repo_url + '/A@1',
+                                     other_repo_url + '/A_COPY@7',
+                                     os.path.join(wc_dir, 'A_COPY'))
+  #...which means there should be no mergeinfo anywhere in WC_DIR, since
+  # this test never created any.
+  svntest.actions.run_and_verify_svn(None, [], [], 'pg',
+                                     SVN_PROP_MERGEINFO, '-R',
+                                     wc_dir)
+
 def avoid_reflected_revs(sbox):
   "avoid repeated merges for cyclic merging"
 



Mime
View raw message