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

RE: moving tree-conflict victim results in assertion failure

From: Bert Huijben <bert_at_qqmail.nl>
Date: Fri, 29 Jul 2011 14:55:15 +0200

> -----Original Message-----
> From: Bert Huijben [mailto:bert_at_qqmail.nl]
> Sent: vrijdag 29 juli 2011 9:30
> To: 'Stefan Sperling'; dev_at_subversion.apache.org
> Subject: RE: moving tree-conflict victim results in assertion failure
>
>
>
> > -----Original Message-----
> > From: Stefan Sperling [mailto:stsp_at_elego.de]
> > Sent: vrijdag 29 juli 2011 1:38
> > To: dev_at_subversion.apache.org
> > 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
Received on 2011-07-29 14:55:50 CEST

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