Collectible Card Game Headquarters

I've heard FControl is about to be changed - that holds a potential for conflicts during merge in branches that also have changed that class.
How can I send my changes from a branch into trunk if I want to publish only a small part of what was made in a branch?

For instance, I've collected all thread-related routines in a new FThreads class, so FControl was changed and CardStorageReader was changed and a few calls in other clases have a different class whose static method they use.

My intention is to send those changes back to branch without transferring the changes to input classes - the ones I am trying to teach some patience.

What's the best way to do that?

My current plan is to get a working copy of trunk, make there the changes that I've invented working on a branch and commit. So that a branch will merge these changes with a few or without conflicts.

I'm trying to see if we can get uhlersoth commit privs to a branch so the changes won't have to happen in trunk. However, if you want to do a partial reintegration with the least amount of hassle, it's pretty much as you said:
assuming you have trunk in c:/forge/trunk/ and your branch is in c:/forge/branches/input_sync/, copy the files you want (not merge) from your branch to trunk. Run to test and check in to trunk. Then, either merge back to your branch and resolve the conflict (if any) or run:
svn merge -c <revnum> --record-only ^/trunk
in your branch to ignore that particular revision in future merges from trunk.

Thanks!

looks like I'm done with that portion of code.
did it all through TortoiseSVN, so didn't even face SVN command line parameters