[PATCH] suspected ill kind mapping in subversion/libsvn_wc/update_editor.c (modcheck_found_node)

[Neels Janosch Hofmeyr-2]

Hyrum,

found this one by chance.
I don't know if this ever fails but it seems like an error. bl...praise says
you wrote that condition, so I'm just running this by you for approval.

~Neels

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413563
* subversion/libsvn_wc/update_editor.c
  (modcheck_found_node): Make a symlink map to svn_node_file instead of _dir.

--This line, and those below, will be ignored--
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 40349)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -1470,7 +1470,8 @@ modcheck_found_node(const char *local_ab
     modified = TRUE;
   else
     SVN_ERR(entry_has_local_mods(&modified, baton->db, local_abspath,
-                                 kind == svn_wc__db_kind_file
+                                 (kind == svn_wc__db_kind_file
+                                  || kind == svn_wc__db_kind_symlink)
                                    ? svn_node_file : svn_node_dir,
                                  scratch_pool));
 

[Hyrum K. Wright-4]

Sounds right.  Thanks for taking a look-see.

-Hyrum

On Nov 1, 2009, at 6:51 PM, Neels Janosch Hofmeyr wrote:

> Hyrum,
>
> found this one by chance.
> I don't know if this ever fails but it seems like an error.  
> bl...praise says
> you wrote that condition, so I'm just running this by you for  
> approval.
>
> ~Neels
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413563* 
>  subversion/libsvn_wc/update_editor.c
>  (modcheck_found_node): Make a symlink map to svn_node_file instead  
> of _dir.
>
> --This line, and those below, will be ignored--
> Index: subversion/libsvn_wc/update_editor.c
> ===================================================================
> --- subversion/libsvn_wc/update_editor.c (revision 40349)
> +++ subversion/libsvn_wc/update_editor.c (working copy)
> @@ -1470,7 +1470,8 @@ modcheck_found_node(const char *local_ab
>     modified = TRUE;
>   else
>     SVN_ERR(entry_has_local_mods(&modified, baton->db, local_abspath,
> -                                 kind == svn_wc__db_kind_file
> +                                 (kind == svn_wc__db_kind_file
> +                                  || kind == svn_wc__db_kind_symlink)
>                                    ? svn_node_file : svn_node_dir,
>                                  scratch_pool));
>
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413751

[Neels Janosch Hofmeyr-2]

Hyrum K. Wright wrote:
> Sounds right.  Thanks for taking a look-see.

r40350.
~Neels

>
> -Hyrum
>
> On Nov 1, 2009, at 6:51 PM, Neels Janosch Hofmeyr wrote:
>
>> Hyrum,
>>
>> found this one by chance.
>> I don't know if this ever fails but it seems like an error.
>> bl...praise says
>> you wrote that condition, so I'm just running this by you for approval.
>>
>> ~Neels
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413563* subversion/libsvn_wc/update_editor.c
>>
>>  (modcheck_found_node): Make a symlink map to svn_node_file instead of
>> _dir.
>>
>> --This line, and those below, will be ignored--
>> Index: subversion/libsvn_wc/update_editor.c
>> ===================================================================
>> --- subversion/libsvn_wc/update_editor.c    (revision 40349)
>> +++ subversion/libsvn_wc/update_editor.c    (working copy)
>> @@ -1470,7 +1470,8 @@ modcheck_found_node(const char *local_ab
>>     modified = TRUE;
>>   else
>>     SVN_ERR(entry_has_local_mods(&modified, baton->db, local_abspath,
>> -                                 kind == svn_wc__db_kind_file
>> +                                 (kind == svn_wc__db_kind_file
>> +                                  || kind == svn_wc__db_kind_symlink)
>>                                    ? svn_node_file : svn_node_dir,
>>                                  scratch_pool));
>>
>>
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413783