# Let's do something stupid and try to reintegrate 1.5.x to trunk!
# I dod this only to demonstrate that the new reintegrate error can get
# unwieldy in some situations.  Though if someone was following the
# suggested reintegrate workflow they should never (?) see anything
# like this.

C:\SVN\src-trunk-2>svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x
..\..\..\subversion\libsvn_client\merge.c:7226: (apr_err=195016)
svn: Reintegrate can only be used if the revisions previously merged from the reintegrate target to 'http://svn.collab.net/repos/svn/branches/1.5.x' are the same, but there are differences:
  branches/1.5.x
    /trunk:29085-29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-29186,29188-29189,29191,29193-29194,29198-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29343,29345-29348,29358-29379,29381-29392,29397-29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29432-29434,29436-29447,29449-29466,29468-29478,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29531,29533,29539-29540,29542,29544,29546,29551,29553,29556,29559,29565,29567-29569,29571-29578,29581,29583,29591,29594,29600,29603,29607,29611,29613-29614,29619,29623,29625-29626,29630-29634,29642,29645,29648,29650,29656,29659-29660,29663-29666,29671-29672,29677-29680,29692,29738-29739,29741-29744,29746,29751,29763,29767,29769-29770,29784,29786-29787,29797,29801,29815,29821,29824,29828,29833,29835,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,29930,29939-29940,29942,29950,29958,29962,29965,29967-29969,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30607,30628-30629,30632-30634,30643-30644,30653,30663,30666,30668,30678,30684,30726,30735,30741,30743,30746-30751,30761-30762,30776-30777,30779,30785,30787,30812,30820,30842-30844,30868,30871,30883,30888,30896,30905,30907,30915,30922,30929,30931,30935,30937,30949,30959,30961-30964,30967,30986,31004,31006,31018,31023,31025,31031,31033,31049,31056,31059-31061,31066,31075,31081-31082,31086,31088,31090,31107,31125-31126,31131,31137-31138,31141,31145,31151,31153,31155,31157,31162,31196,31199,31203,31209,31223,31228,31232,31234,31243,31246,31249-31251,31271,31273-31276,31280,31283,31287,31292,31300-31301,31303,31312-31313,31317,31334,31348,31369,31391,31396,31398-31402,31407,31415,31425,31431,31434,31451-31453,31464,31468,31470,31473-31475,31482,31485,31488-31489,31504,31507,31516,31523,31534,31546,31550,31575,31594,31601,31603,31619-31620,31622,31630,31658-31659,31670,31673,31685,31688,31692,31695,31719,31722,31725,31727,31737,31749,31757,31769,31786,31806,31817,31820,31825,31833,31837,31852,31859,31867-31868,31873-31875,31884,31900,31926-31927,31929,31944,31948,31964,31994,32012,32017,32019,32023,32029,32038,32056,32080,32142,32153,32160,32164,32169,32179,32181,32185,32187,32236-32237,32288,32342-32343,32355,32357,32360,32365,32409,32416-32417,32421,32441-32442,32444-32445,32463,32467,32470,32491,32494,32497,32510,32522-32523,32538,32545,32558,32582,32596,32636,32639,32643,32672-32674,32703,32706-32708,32730,32739,32771,32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33173,33178,33185,33201,33212,33369,33447,33464-33465,33641,33644,33693,33704,33840
  branches/1.5.x/CHANGES
    /trunk/CHANGES:29081-31786,31789-32286,32288,32290-32763,32771,32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33144-33569,33641,33644,33693,33704,33840
  branches/1.5.x/COMMITTERS
    /trunk/COMMITTERS:29090,29432,29969,30607,30628,30632,30735,30746-30750,30812,30915,30929,30935,30949,30959,30961-30962,30967,31004,31006,31018,31023,31025,31031,31033,31049,31056,31059-31061,31066,31075,31081-31082,31086,31088,31090,31107,31125-31126,31131,31137-31138,31141,31145,31151,31153,31155,31157,31162,31196,31199,31203,31209,31223,31228,31232,31234,31243,31246,31249-31251,31271,31273-31276,31280,31283,31287,31292,31300-31301,31303,31312-31313,31317,31334,31348,31369,31391,31396,31398,31402,31407,31415,31425,31431,31434,31464,31468,31470,31482,31485,31488-31489,31504,31507,31516,31546,31550,31575,31594,31601,31603,31619-31620,31622,31630,31658-31659,31670,31673,31685,31688,31692,31695,31719,31722,31725,31727,31737,31749,31757,31769,31786,31806,31817,31820,31825,31833,31837,31852,31859,31867-31868,31873-31875,31884,31900,31926-31927,31929,31944,31948,31964,31994,32012,32017,32019,32023,32029,32038,32056,32080,32142,32153,32160,32164,32169,32179,32181,32185,32187,32236-32237,32288,32342-32343,32355,32357,32360,32365,32409,32416-32417,32421,32441-32442,32444-32445,32463,32467,32470,32491,32494,32497,32510,32522-32523,32538,32545,32558,32582,32596,32636,32639,32643,32672-32674,32703,32706-32708,32730,32739,32771,32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33173,33178,33185,33201,33212,33369,33447,33464-33465,33641,33644,33693,33704,33840
  branches/1.5.x/subversion/bindings/swig
    /trunk/subversion/bindings/swig:29085-29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-29186,29188-29189,29191,29193-29194,29198-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29343,29345-29348,29358-29379,29381-29392,29397-29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29432-29434,29436-29447,29449-29466,29468-29478,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29531,29533,29539-29540,29542,29544,29546,29551,29553,29556,29559,29565,29567-29569,29571-29578,29581,29583,29591,29594,29600,29603,29607,29611,29613-29614,29619,29623,29625-29626,29630-29634,29642,29645,29648,29650,29656,29659-29660,29663-29666,29671-29672,29677-29680,29692,29738-29739,29741-29744,29746,29751,29763,29767,29769-29770,29784,29786-29787,29797,29801,29815,29821,29824,29828,29833,29835,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,29930,29939-29940,29942,29950,29958,29962,29965,29967-29969,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30607,30628-30629,30632-30634,30643-30644,30653,30663,30666,30668,30678,30684,30726,30735,30741,30743,30746-30751,30761-30762,30776-30777,30779,30785,30787,30812,30820,30842-30844,30868,30871,30883,30888,30896,30905,30907,30915,30922,30929,30931,30935,30937,30949,30959,30961-30964,30967,30986,31004,31006,31018,31023,31025,31031,31033,31049,31055-31056,31059-31061,31066,31075,31081-31082,31086,31088,31090,31107,31125-31126,31131,31137-31138,31141,31145,31151,31153,31155,31157,31162,31196,31199,31203,31209,31223,31228,31232,31234,31243,31246,31249-31251,31271,31273-31276,31280,31283,31287,31292,31300-31301,31303,31312-31313,31317,31334,31348,31369,31391,31396,31398,31402,31407,31415,31425,31431,31434,31464,31468,31470,31482,31485,31488-31489,31504,31507,31516,31546,31550,31575,31594,31601,31603,31619-31620,31622,31630,31658-31659,31670,31673,31685,31688,31692,31695,31719,31722,31725,31727,31737,31749,31757,31769,31786,31806,31817,31820,31825,31833,31837,31852,31859,31867-31868,31873-31875,31884,31900,31926-31927,31929,31944,31948,31964,31994,32012,32017,32019,32023,32029,32038,32056,32080,32142,32153,32160,32164,32169,32179,32181,32185,32187,32236-32237,32288,32342-32343,32355,32357,32360,32365,32409,32416-32417,32421,32441-32442,32444-32445,32463,32467,32470,32491,32494,32497,32510,32522-32523,32538,32545,32558,32582,32596,32636,32639,32643,32672-32674,32703,32706-32708,32730,32739,32771,32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33173,33178,33185,33201,33212,33369,33447,33464-33465,33641,33644,33693,33704,33840
  branches/1.5.x/subversion/libsvn_client/merge.c
    /trunk/subversion/libsvn_client/merge.c:29085-29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-29186,29188-29189,29191,29193-29194,29198-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29343,29345-29348,29358-29379,29381-29392,29397-29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29432-29434,29436-29447,29449-29466,29468-29478,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29531,29533,29539-29540,29542,29544,29546,29551,29553,29556,29559,29565,29567-29569,29571-29578,29581,29583,29591,29594,29600,29603,29607,29611,29613-29614,29619,29623,29625-29626,29630-29634,29642,29645,29648,29650,29656,29659-29660,29663-29666,29671-29672,29677-29680,29692,29738-29739,29741-29744,29746,29751,29763,29767,29769-29770,29784,29786-29787,29797,29801,29815,29821,29824,29828,29833,29835,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,29930,29939-29940,29942,29950,29958,29962,29965,29967-29969,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30607,30628-30629,30632-30634,30643-30644,30653,30663,30666,30668,30678,30684,30726,30735,30741,30743,30746-30751,30761-30762,30776-30777,30779,30785,30787,30812,30820,30842-30844,30868,30871,30883,30888,30896,30905,30907,30915,30922,30929,30931,30935,30937,30949,30959,30961-30964,30967,30986,31004,31006,31018,31023,31025,31031,31033,31049,31056,31059-31061,31066,31075,31081-31082,31086,31088,31090,31107,31125-31126,31131,31137-31138,31141,31145,31151,31153,31155,31157,31162,31196,31199,31203,31209,31223,31228,31232,31234,31243,31246,31249-31251,31271,31273-31276,31280,31283,31287,31292,31300-31301,31303,31312-31313,31317,31334,31348,31369,31391,31396,31398-31402,31407,31415,31425,31431,31434,31451-31453,31464,31468,31470,31473-31475,31482,31485,31488-31489,31504,31507,31516,31523,31534,31546,31550,31575,31594,31601,31603,31619-31620,31622,31630,31658-31659,31670,31673,31685,31688,31692,31695,31719,31722,31725,31727,31737,31749,31757,31769,31786,31806,31817,31820,31825,31833,31837,31852,31859,31867-31868,31873-31875,31884,31900,31926-31927,31929,31944,31948,31964,31994,32012,32017,32019,32023,32029,32038,32056,32080,32142,32153,32160,32164,32169,32179,32181,32185,32187,32236-32237,32288,32342-32343,32355,32357,32360,32365,32409,32416-32417,32421,32441-32442,32444-32445,32463,32467,32470,32491,32494,32497,32510,32522-32523,32538,32545,32558,32582,32596,32636,32639,32643,32672-32674,32703,32706-32708,32730,32739,32771,32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33173,33178,33185,33201,33212,33296,33369,33447,33464-33465,33641,33644,33693,33704,33840


C:\SVN\src-trunk-2>