I just came across this bug using 1.6.x_at_36637 and
http://serf.googlecode.com/svn/trunk@1219. I'll look into it more
tomorrow, but in the meantime if anyone quickly try the following and
see if you get the same bug, please let me know, thanks.
# Checkout a backport branch
C:\SVN>svn co http://svn.collab.net/repos/svn/branches/1.5.x-r36613@36636
-q src-branch
C:\SVN>cd src-branch
# Merge a change from trunk
C:\SVN\src-branch>svn merge http://svn.collab.net/repos/svn/trunk . -c36615
--- Merging r36615 into 'subversion\libsvn_client\merge.c':
U subversion\libsvn_client\merge.c
# Mergeinfo is updated as expected...
C:\SVN\src-branch>svn st
M .
M www\images\subversion_logo-200x173.png
M www\images\subversion-diagram.png
M www\images\subversion_logo_hor-468x64.png
M www\images\subversion_logo-384x332.png
M COMMITTERS
M notes\tree-conflicts\scratch-pad.txt
M subversion\include\private
M subversion\libsvn_wc\adm_ops.c
M subversion\libsvn_subr
MM subversion\libsvn_client\merge.c
M subversion\bindings\swig
M subversion\tests\cmdline\svntest\actions.py
M CHANGES
#...but the mergeinfo on the root of the branch is corrupted:
C:\SVN\src-branch>svn pg svn:mergeinfo -v
Properties on '.':
svn:mergeinfo
/branches/1.5.x-34184:34583-34667
/branches/1.5.x-34432:34670-34724
/branches/1.5.x-issue3067:32110-32240
/branches/1.5.x-issue3157:32091-32101
/branches/1.5.x-issue3174:32104-32274
/branches/1.5.x-r30215:30236,30238,30245,30288
/branches/1.5.x-r30756:34779-34796
/branches/1.5.x-r30868:30877-30896
/branches/1.5.x-r31314:34402-34531
/branches/1.5.x-r31516:31518-31575
/branches/1.5.x-r32470:32472-32602
/branches/1.5.x-r32968:33699-33798
/branches/1.5.x-r33447:33453-33473
/branches/1.5.x-r33465:33467-33475
/branches/1.5.x-r33641:33806-33809
/branches/1.5.x-r34050-followups:34565-34612
/branches/1.5.x-r34487:34488-34507
/branches/1.5.x-r35566:35574-36098
/branches/1.5.x-ra_serf-backports:32280-32552
/branches/1.5.x-rb-test-fix:34842-34845
/branches/1.5.x-reintegrate-improvements:34512-34848
/branches/1.5.x-tests-pass:30851-30899
/branches/issue-3220-dev:32136-32152
/branches/log-g-performance:30867-30958
/branches/r30963-1.5.x:30982-31002
/branches/reintegrate-improvements:33779-34090
/branches/svn-mergeinfo-enhancements:30122
/branches/svnpatch-diff:31831
/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-2
9251,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-2
9423,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,2
9546,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,2
9656,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,2
9835,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,2
9986,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-3
0181,30185,30233,30237,30239,30246,30249,30256-30257,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,3
0380,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-3
0521,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-3
0751,30756,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,3
0967,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,3
1155,31157,31162,31196,31199,31203,31209,31223,31228,31232,31234,31243,31246,31249-31251,31271,31273-31276,31280,31283,31287,31292,31300-31301,31303,31311-31314,31317,31334,31348,3
1369,31391,31393,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,3
1594,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,3
1852,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,3
2185,32187,32236-32237,32288,32342-32343,32355,32357,32360,32365,32409,32416-32417,32421,32441-32442,32444-32445,32448,32463,32467,32470,32491,32494,32497,32510,32522-32523,32538,3
2545,32558,32582,32596,32636,32639,32643,32672-32674,32703,32706-32708,32730,32739,32771,32790,32796,32798,32900,32907,32911-32913,32930,32968,32975,32977,33002,33013,33016,33022,3
3024,33026,33109,33112,33121,33136-33137,33173,33178,33185,33201,33212,33369,33447,33464-33465,33641,33644,33693,33704,33775,33782,33788,33840,33866,33873-33874,34050-34051,34053,3
4082,34091,34094,34096,34171,34184,34196,34244,34256,34306,34331,34385,34393,34423,34432,34487,34492,34494,34506,34545,34547,34560,34562,34585,34653,34656,34669,34732,34742,34774,3
4794,34814,34822,34835,34838,34875,34919,34924,35040,35143,35145,35250,35286,35297,35367,35466,35516,35566,35712-35713,35733,35981,36096-36097,36138,36613,36615
/trunk/%♥☺?\176$♥☺:36615
^^^^^^^^^^^^^^^^^^^^^^^^
The merge works fine with trunk (using neon or serf) and with 1.6.x
(using neon). I tried with 1.5.6 but the merge aborts.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1343641
Received on 2009-03-17 23:19:23 CET