Re: problems when merging branches

On Wed 10 May 2006 12:02, Juergen Richtsfeld wrote:
> 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.
>

Someone has comitted to trunk since you didi the merge

> 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

-- 
John Allen,                          mailto:john.allen@orbiscom.com
Orbiscom Ltd,                        http://www.orbiscom.com
Block 1, 
Blackrock Business Park, 
Carysfort Avenue, 
Blackrock, 
Co. Dublin,
Ireland. 
Tel: +353-1-217.8603
Fax: +353-1-294.5119
Mobile: +353-085-1295486
Mandriva Linux release 2006.0 (Official) for i586, kernel 2.6.12-15mdk
 13:45:27 up  1:14,  1 user,  load average: 0.03, 0.08, 0.07
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org