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

RE: Re: problems when merging branches

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

 
> >
> > 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

no, i tried it several times and ensured that this did not happen, both via svn up AND via viewing the log with websvn.

>
> > 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
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 10 17:05:06 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.