Hey,
I often hit this problem:
I have to merge a svn branch into trunk. The branch is old, and has seen a lot of changes that were manually copied from one branch to the other. svn:merge info is not present.
Araxis almost makes my life easy. I make a checkout of trunk, a checkout of my branch, and a checkout of my branch at the revision it was created at. (it was copied from trunk)
Araxis now lets me "merge changes into common ancestor", which applies all changes into the checkout of my branch at its first revision. However, I need these changes in my checkout of trunk.
So far the best solution I have is to:
- Araxis merge on 3 svn exports, and have araxis merge into the common ancestor. Then delete all files in my trunk checkout
- copy in the common ancestor export containing the merge results
- deleting all empty folders in the trunk checkout
- svn adding all new files/dirs
- svn rm'ing files/dirs that are missing
I hope somebody sees a way to optimize this workflow. (I realize a smarter vcs solution makes this easier, but unfortunattely I can't go back in time.)