i accidently sent the last message to the replier only...
> -----Original Message-----
> From: Juergen Richtsfeld [mailto:Juergen.Richtsfeld@borland.com]
> Sent: Wednesday, May 10, 2006 4:59 PM
> To: users@subversion.tigris.org
> Subject: RE: Re: problems when merging branches
>
>
> > >
> > > > 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.
> Just noticed you did an "svn up", so I'm at as much a loss as you are.
> Do an svn status on '<somefile>' and examine the output
i executed the svn status on a file that causes the described problems, and i get a single line like
686 3 username theproblematicfile
when i execute the same on the directory that contains this file, the output contains exactly the same line. what i forgot is that the problematic file(s, there are more) are all binary (at least i didn't find a non-binary problematic file).
>
> >
> > > 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
>
>
---------------------------------------------------------------------
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:18:39 2006