ability to disable merge on certain trees

[Jelmer Vernooij]

bzr merge currently fails on bzr-svn working copies. It would be nice if it could be disabled entirely, so users get a nice error message indicating merge is not possible.

Another reason why it would be nice to disable merge is that pending merges are pulled from the other repo into this repo. If this is a remote svn repo, this means the revisions will be visible. If you merge the wrong branch, it means that branch will be pushed before some possible errors are printed. Even if the errors were printed earlier, it seems like a bad idea to push revisions to the remote repository while they are still pending merges.

I just hit this problem myself, by running "bzr merge ~/samba-gtk" in a svn working copy. That directory didn't exist, so bzr pushed the branch at ~ to the svn repository and then complained the referenced path didn't exist.

(http://svn.debian.org/wsvn/pkg-samba/branches/?rev=2700&sc=1)