Re: [issue 2022]: merge and update touches conflicted files

On Wed, 24 Jan 2007, Nik Clayton wrote:
...
> If it's going to behave like that I'd rather it didn't. How much
> effort would it be for "svn merge" to scan the working copy first
> (or those files in the working copy that will be affected by the
> merge), checking for any files that are marked as conflicted, and
> refuse to merge anything if any files are in conflict.

Incidentally, this is what 'svnmerge.py merge' does (at least, with
the --force option).