Argh - frustration level high

I'm trying to complete - what I believe should be - a very simple task. I
simply want to merge two branches into a third. I can test this using
the --dry-run parameter to svn merge, but it seems that whenever I try to do
the real deal, I get the following error.

subversion/libsvn_wc/adm_files.c:939: (apr_err=155000)
svn: URL
'svn://server/repo/blah/branches/linux/temp_windows_baselines/20040406/modem
/source/release' doesn't match existing URL
'svn://server/repo/blah/branches/linux/old_main/modem/source/release' in
'modem/source/release'

I "resolved" the bug initially by deleting the problem directory in the
working copy and the merge made it past the original failure point. I quote
the word resolved because that doesnt' resolve anything, it just helps the
svn client get a little farther before it fails.

What does this error message mean? Any help would be welcome. This is svn
1.0.1 on ydl 2.3.

Thanks,
brian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 13 21:22:37 2004