On Thu, Oct 15, 2009 at 15:38, Greg Stein <gstein_at_gmail.com> wrote:
> On Thu, Oct 15, 2009 at 08:07, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>>...
>> +++ trunk/subversion/libsvn_wc/wc-metadata.sql Thu Oct 15 05:07:56 2009 (r40043)
>> @@ -429,9 +429,31 @@ ADD COLUMN right_checksum TEXT;
>>
>> /* ------------------------------------------------------------------------- */
>>
>> -/* Format 15 introduces new handling for conflict information. */
>> +/* Format 15 introduces new handling for excluded nodes. */
>> -- format: 15
>>
>> +UPDATE base_node
>> +SET checksum = NULL, translated_size = NULL, changed_rev = NULL,
>> + changed_date = NULL, changed_author = NULL, depth = NULL,
>> + symlink_target = NULL, last_mod_time = NULL, properties = NULL,
>> + incomplete_children = NULL, file_external = NULL
>> +WHERE depth = 'exclude';
>> +
>> +/* We don't support cropping working nodes, but we might see them
>> + via a copy from a sparse tree. Convert them anyway to make sure
>> + we never see depth exclude in our database */
>> +UPDATE working_node
>> +SET checksum = NULL, translated_size = NULL, changed_rev = NULL,
>> + changed_date = NULL, changed_author = NULL, depth = NULL,
>> + symlink_target = NULL, copyfrom_repos_id = NULL, copyfrom_repos_path = NULL,
>> + copyfrom_revnum = NULL, moved_here = NULL, moved_to = NULL,
>> + last_mod_time = NULL, properties = NULL, keep_local = NULL
>> +WHERE depth = 'exclude';
>
> Shouldn't these set presence='excluded' ??
Per your offlist email about not getting to this tonite, I've fixed
this in r40064.
Other devs: if you have depth=exclude directories in your working
copies, then make sure you have this change before you upgrade a
format 15 working copy.
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2408087
Received on 2009-10-16 05:11:25 CEST