Cleaning up weird mergeinfo after unconventional merging

Hi,    I've been using SVN for a few years and am very happy with it. I was also very excited to try out the new merge capabilities on our project. However, due to the somewhat weird history of our repository, I have trouble using some of the functionality (reintegrate, to be precise).    The problem is this: Once upon a time our project had a feature branch that deviated so much from trunk that it was easier to replace trunk altogether than to merge the changes back, something like this:    * normal development in trunk  * copy from trunk to feature branch f  * delete of trunk  * copy from f to trunk    This all works fine until merge tracking enters the field. Now when I create a new feature branch f2, I can merge new revisions from trunk just fine, but reintegrate fails because it doesn't think that trunk and f2 has the same history. After a few merges from trunk to f2, its mergeinfo looks like this:    /projectname/branches/f:2552-2617  /projectname/trunk:2311-2551,2653-2656    when what I really would want is to have it show simply all revisions from trunk.    I realize why this causes trouble when trying to use reintegrate, but is there a way to fool SVN into forgetting about my weird merge history and see trunk as a simple continuous chain from 1 to HEAD?

Last updated 15 years ago

Sounds similar to my problems here. SVN doesn't seem to have any way to say "when I merge branch X to branch Y, I just want branch Y to contain the same as branch X". And to date, no-one here has an answer, which makes me suspect that this simple operation is not something SVN is capable of doing.    Merge tracking can be a wonderful thing. But sometimes you do need to say "forget incremental changes, I just want *that* version of it", and it looks like the SVN designers have forgotten that this might be a problem.

It's also possible that many people don't have an answer because they're still on 1.4. The answer I gave you in that thread works just great for that version.    Unfortunately, I don't know the 1.5 version enough to comment. Once I've upgraded, I hope to be able to figure that out.