the eclipse cvs client allows to reject a change by simply clicking "mark the local file as merged", and commit it.
There are multiple enhancement requests filed against sublicpse which get rejected because "svn does not offer such a feature via API" and "we (subclipse) do not tinker with your files, except via svn API", see e.g. http://subclipse.tigris.org/issues/show_bug.cgi?id=761. Alone from the number of requirements its seems pretty clear that users do want this feature. But I am wondering what the correct place to implement would be? Or to put it in other words, if one would implement the feature into the svn command line client, where would this feature go? above or below the API? rupert.
