Unsupported change type Merge

Sep 24, 2009 at 11:54 AM

I'm trying out SvnBridge to circumvent some limitations in TFS (mainly the ability to apply deletes and renames after-the-fact.)

Was working well for one morning, but then merged two branches (using VS Source Control Explorer) and now when I try to update the the target branch via TSVN/SvnBridge, I get:

Server sent unexpected return value (500 Internal Server Error) in response to
REPORT request for '/c700-build/!svn/vcc/default'

An the SvnBridge system tray icon pops up the message "Unsupported change type Merge".

Deleting my working copy and re-checking out  has *not* fixed it this time (already had to do that a couple of times.)

Using TSVN 1.6.3, SvnBridge v5.