On Fri, Jul 29, 2011 at 09:29:41AM +0200, Bert Huijben wrote: > > > > -----Original Message----- > > From: Stefan Sperling [mailto:[email protected]] > > Sent: vrijdag 29 juli 2011 1:38 > > To: [email protected] > > Subject: moving tree-conflict victim results in assertion failure > > > > The script below creates a tree-conflict in a rather strange way > > (checkout on top of an existing unversioned tree). But what happens > > next is more interesting. It tries to move the tree-conflict victim > > and this triggers an assertion in wc_db.c. > > The problem here is not moving a tree conflict but copying (moving?) a > deleted node (which happens to be tree conflicted. > > I think we should make this return a proper error for 1.7.0 if it isn't in > the new move code.
Just to clarify: It is _not_ the new move code. This is in 1.7.x.
