Mark revision as non-eligible to be merged

I'm currently doing a pretty heavy task: merging a bunch of revision from the project trunk to some branches, full of conflicts.

I would like to take this process to perform some cleanup once some revisions, will never be merged from the trunk to the branches开发者_如何学JAVA.

It is possible to mark some specific revision(s) as non-eligible to merged?

You can merge the revision to said location but use the --record-only flag. So if r3 of branches/b1 should never be merged to trunk, you could do this:

svn merge -c3 --record-only ^/branches/b1 .

Where your current working directory is the working copy pointing to trunk. Commit that change, which should only be svn:mergeinfo changes, and you should disallow merging that revision from /branches/b1 to /trunk.

As @jeremy-whitlock answered, committing the merge as "record-only" is they way to go.

For those of you using TortoiseSVN, this option will be on the second Merge dialog: