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

Re: keep_local in harvest_committables

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 12 May 2010 23:50:54 +0100

Neels J Hofmeyr <neels_at_elego.de> writes:

> On 2010-05-13 00:25, Philip Martin wrote:
>> Neels J Hofmeyr <neels_at_elego.de> writes:
>>> The bottom line is: simply remove that madly misguided entry->keep_local
>>> conditional and always call bail_on_tree_conflicted_children(). The rest of
>>> the patch is mending the test suite to be sensible about it. Will do.
>> See r943722 for a slightly different approach. If you want to change
>> it further that's fine by me.
> * neels feels bad for causing work by not reading dev@ for a few days

Don't worry, the time consuming bit was the url/entry stuff not

> Should we keep that temp func for the time being?

I don't mind. The whole 'svn rm --keep-local' with tree conflicts is
a bit suspect. After a commit the unversioned directory still
contains a .svn directory. Reverting instead of committing leads to
unversioned directories that should be versioned. See my other

Received on 2010-05-13 00:51:32 CEST

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