Re: keep_local in harvest_committables

2010-05-12 Thread Philip Martin
Neels J Hofmeyr writes: > On 2010-05-13 00:25, Philip Martin wrote: >> Neels J Hofmeyr 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

Re: keep_local in harvest_committables

2010-05-12 Thread Neels J Hofmeyr
On 2010-05-13 00:25, Philip Martin wrote: > Neels J Hofmeyr 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.

Re: keep_local in harvest_committables

2010-05-12 Thread Philip Martin
Neels J Hofmeyr 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.

Re: keep_local in harvest_committables

2010-05-12 Thread Neels J Hofmeyr
On 2010-05-12 16:46, Philip Martin wrote: > I saw you talking about keep-local on IRC a couple of days ago, are > you working on keep-local in harvest_committables? Yes, indeed I am ... was ... will. I've been kept busy by real life issues, but that's about to pass. Thanks for reminding me, btw.