How to merge 'already merged' revisions?

Question

I've merged a few revisions from one branch to the trunk and committed them. Then I've found there was an issue with this merge so I've reverted it back and committed the revert.

Now after I've fixed everything I want to merge these revisions again. But Tortoise doesn't let me do this, it says "already merged" and doesn't want to apply files to the local copy. What am I doing wrong?

Answer 1

Subversion merge tracking is not particularly sophisticated. You just get a versioned property called svn:mergeinfo in the top-level directory where you apply merges that looks like this:

You possibly forgot to revert the property change (you can verify that in the SVN Show log dialog).

You may be able to fix it by reverting the property change from e.g. the log (right click and Revert changes from this revision) but, if the GUI gets on the way, you can also edit the property yourself: