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

Re: Error with tree conflict data in database after update from 1.6

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 21 Mar 2011 10:48:29 +0100

On Mon, Mar 21, 2011 at 12:33:34PM +1300, Alan Wood wrote:
> There should not have been any conflict data of any sort in this
> working copy as I am the only developer and I have only every had
> one working copy.

That's not a valid assumption.
It is possible to inflict tree conflicts upon yourself, with only
one working copy: http://subversion.apache.org/faq.html#self-tree-conflict

> I hope someone may be able to plug this little hole in the upgrade
> system.

Looks like the upgrade code shouldn't insert empty conflict description
skels into the DB. Can you file an issue that points to this mailing list
thread, so that this doesn't fall through the cracks? Thanks.

And thanks for testing!
Received on 2011-03-21 10:49:10 CET

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