> -----Original Message-----
> From: Bert Huijben [mailto:[email protected]]
> Sent: vrijdag 29 juli 2011 9:30
> To: 'Stefan Sperling'; [email protected]
> Subject: RE: moving tree-conflict victim results in assertion failure
>
>
>
> > -----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.
Test added in r1152189.
Fixed in r1152190.
And nominated for backport to 1.7.0 in r1152193. (Probably needs some
trivial conflict resolution in the test)
Bert
