Here’s the situation: On a particular branch, some changes have been merged in from the trunk, and also changes to the branch have been merged back into the trunk.
The question I have is this: What, if anything, does the merge management in Subversion do if I try to merge back into the trunk from the branch a revision that was in itself just a merge from the trunk to the branch?
Will this cause problems? If so, what sorts? Or should this be a perfectly fine thing to do?
Or does the new merge just treat those changes like any other and simply try to apply them?
That’s an scenario even the merge tracking of newer SVN versions can’t handle automatically. So you have specify the revisions you want to merge back into the trunk manually and you have to make sure to exclude the revisions which are merges from trunk to the branch.
If you try remerge changes which are already present trunk they will be treated as normal modifications. This will lead to conflicts inevitably.