problems when merging branches

[Juergen Richtsfeld <Ju...@borland.com>]

i created a branch from trunk, call it B1. B1 had some changes, trunk too.

now i ensured my workingcopy is a clean trunk, and i executed:

svn merge -r548:HEAD http://host/svn/project/branches/B1

things were done, no conflict.

now i started a clean build to verify if it compiles at least. it does.

when i execute a 
svn commit -m"merged B1"

i get messages like:

Error Item '<somefile>' is out of date
Error You have to update your working copy first.

fine, so i do a svn up, but it doesn't help anything.

what am i doing wrong?

jürgen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org