[ Please CC: me since I am not subscribed to the list. Thank you. ] Hi,
I'd like to report what I think is a yet another bug in SVN 1.6.16. (Seems that SVN bugs are currently liking me...) I reproduced it both with the command line client and with TortoiseSVN for Windows. When you have two branches and regularly merge files from one branch to another, you can either merge them on the whole branch (mergeinfo will be written there) or on a subfolder (which puts the mergeinfo on the subfolder). In case you have files changed in a subfolder by a merge you did on the whole branch, and anyone on your team merges *one* change on that branch to that subfolder only, that branch shows *all* merges that were made in this folder (which were several hundreds) in the merge history for that revision. I attached a dump of a simple repository containing 2 changes on trunk which are individually merged to the branch. The second merge was performed on the subfolder and its revision history is broken. (Not a big deal in this small example, but a big deal in our "live" repository). Regards, Michael
SVN-fs-dump-format-version: 2 UUID: bbee442e-a645-d94c-8f53-99f3948855a1 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2011-04-28T17:49:06.515625Z PROPS-END Revision-number: 1 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 Initial commit K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:50:16.078125Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/dir/file.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 25 Text-content-md5: 4f331c97c5e6214eb0cfefd47a818b74 Text-content-sha1: 619d37214d20ed306dfd9222b14006802ea3bbc6 Content-length: 35 PROPS-END One To Three For Five Revision-number: 2 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 13 Create branch K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:50:32.796875Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: add Node-copyfrom-rev: 1 Node-copyfrom-path: trunk Revision-number: 3 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 fix first typo K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:50:59.984375Z PROPS-END Node-path: trunk/dir/file.txt Node-kind: file Node-action: change Text-content-length: 26 Text-content-md5: 337555ea26dbf2b37a0d5df7f0677525 Text-content-sha1: 094392cfddae63e113de72f342ff2df1c6472db3 Content-length: 26 One Two Three For Five Revision-number: 4 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Fix second typo K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:51:20.984375Z PROPS-END Node-path: trunk/dir/file.txt Node-kind: file Node-action: change Text-content-length: 27 Text-content-md5: b7427b1a57551e6b5535a313214ebc1d Text-content-sha1: 42ab6c99f82597ca9cf326b33bad8326bb52e507 Content-length: 27 One Two Three Four Five Revision-number: 5 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 16 merge first typo K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:52:41.078125Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: change Prop-content-length: 42 Content-length: 42 K 13 svn:mergeinfo V 8 /trunk:3 PROPS-END Node-path: branches/branch1/dir/file.txt Node-kind: file Node-action: change Text-content-length: 26 Text-content-md5: 337555ea26dbf2b37a0d5df7f0677525 Text-content-sha1: 094392cfddae63e113de72f342ff2df1c6472db3 Content-length: 26 One Two Three For Five Revision-number: 6 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 17 merge second typo K 10 svn:author V 5 Michi K 8 svn:date V 27 2011-04-28T17:54:19.578125Z PROPS-END Node-path: branches/branch1/dir Node-kind: dir Node-action: change Prop-content-length: 47 Content-length: 47 K 13 svn:mergeinfo V 12 /trunk/dir:4 PROPS-END Node-path: branches/branch1/dir/file.txt Node-kind: file Node-action: change Text-content-length: 27 Text-content-md5: b7427b1a57551e6b5535a313214ebc1d Text-content-sha1: 42ab6c99f82597ca9cf326b33bad8326bb52e507 Content-length: 27 One Two Three Four Five
