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

Re: tree conflicts with replace

From: Vincent Lefevre <vincent+svn_at_vinc17.org>
Date: Thu, 13 Aug 2009 11:50:04 +0200

Hi,

On 2009-08-13 02:02:42 +0100, Julian Foad wrote:
> On Thu, 2009-08-13, Neels Janosch Hofmeyr wrote:
> > [[[
> > $ svn revert
> > Reverted 'alpha'
> > $ svn st
> > ? alpha
> > ]]]
> >
> > --> Wait, the local changes were both a "delete" and an "add". Only the
> > "add" got reverted. Is that intended? BASE seems to be in-between the atomic
> > replace (sorry for the language). That's bad.
>
> That's got to be the root of this problem. Sounds like a simple bug. The
> wierdness that follows it is not surprising, if it leaves the WC in a
> bad state.

Is this the same bug I've mentioned in my message

  svn 1.6.4 bug yields a working copy with missing data

posted yesterday?

Is there an issue in the tracker?

-- 
Vincent Lefèvre <vincent@vinc17.org> - Web: <http://www.vinc17.org/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/>
Work: CR INRIA - computer arithmetic / Arenaire project (LIP, ENS-Lyon)
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383217
Received on 2009-08-13 11:50:57 CEST

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