reintegration

What happens if I don't use the --Reintegrate option in Subversion 1.5?

I thought I had figured out everything I needed to know about Subversion 1.5 and was happily merging between my feature branches and the trunk. Then I realized I've not been doing what I thought I had. I have not been using the --reintegrate parameter when merging back to the trunk from a feature branch. Specifically I use TortoiseSVN...

Using git-svn to merge a svn branch back into trunk and trunk back into the branch.

So I'm using git and interacting with an svn repo. I have a svn TRUNK that looks like this: A-B-C-D And a svn bug_fixes branch that branches off at commit B or C: -c-d-e-f-g-h-i Now I need to get the cdefghi commits that are in my svn branch back into the master branch. I'm aware that I could just do a squashed commit, let's cal...