Today I committed a new version of svnmerge to repotools that updates our version to the latest upstream version.

One of the best new features of the upstream svnmerge is the '--record-only' flag.
So, what is this used for?
Say, you have a fix and you commit it to trunk.
Some devs on IRC or on the mailinglist tell you the fix should also be in 1.4.
You go and backport the fix to the 1.4 branch.

Normally, you would block this revision to trunk with the block4trunk command.
This will add your commit to the 'branch-1.4-blocked' property.
This is not really correct, because the fix is already there so you actually want to tell svnmerge that it's already merged.
For this, the subversion devs introduced the --record-only option to only record this commit.
It won't touch any files, but it will update the 'branch-1.4-merged' property and create a commit-message file for you.

So from now on (thanks a lot to Corydon for creating this command in mergetool) you dont run 'block4trunk ' but 'record4trunk '

Issues with the new svnmerge script in repotools can be directed to me.