[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

problems when merging branches

From: Juergen Richtsfeld <Juergen.Richtsfeld_at_borland.com>
Date: 2006-05-10 11:36:16 CEST

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?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 10 18:54:53 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.