Comment 4 for bug 209025

I could also use something like this for local/test server config changes which shouldn't be propagated back into the trunk.

Perhaps as an alternative solution: the ability to specify non-merging (ignored) local commits, so that a generic merge by another branch will not include that ignored commit? The only way to merge such an otherwise ignored revision would be to explicitly specify the single revision in the merge command.
This could possibly also reduce the amount of work needed to merge back and forth, when there are changes to those files which should indeed be propagated.