You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/10/07 19:53:09 UTC

Re: svn commit: r39817 - trunk/subversion/libsvn_wc

On Wed, Oct 7, 2009 at 05:27, Bert Huijben <rh...@sharpsvn.net> wrote:
>...
> +++ trunk/subversion/libsvn_wc/log.c    Wed Oct  7 02:27:15 2009        (r39817)
>...
> @@ -597,8 +595,9 @@ log_do_modify_entry(struct log_runner *l
>          which case we don't want to reincarnate it.  */
>       const svn_wc_entry_t *existing;
>
> -      SVN_ERR(svn_wc_entry(&existing, tfile, loggy->adm_access, TRUE,
> -                           loggy->pool));
> +      SVN_ERR(svn_wc__get_entry(&existing, loggy->db, local_abspath, TRUE,
> +                                svn_node_unknown, FALSE,
> +                                loggy->pool, loggy->pool));

Whoops. You changed the SHOW_HIDDEN param value here. Probably not a good idea.

>...
> @@ -896,9 +885,8 @@ log_do_committed(struct log_runner *logg
>      entry, or if the entry states that our item is not either "this
>      dir" or a file kind, perhaps this isn't really the entry our log
>      creator was expecting.  */
> -  SVN_ERR(svn_wc_adm_probe_retrieve(&adm_access, loggy->adm_access, full_path,
> -                                    pool));
> -  SVN_ERR(svn_wc_entry(&orig_entry, full_path, adm_access, TRUE, pool));
> +  SVN_ERR(svn_wc__get_entry(&orig_entry, loggy->db, local_abspath, FALSE,
> +                            svn_node_unknown, FALSE, pool, pool));

Here is another change of the SHOW_HIDDEN parameter.

>...

Cheers,
-g

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

Re: svn commit: r39817 - trunk/subversion/libsvn_wc

Posted by Greg Stein <gs...@gmail.com>.
As Bert pointed out on IRC... I'm off base here. I was thinking of
svn_wc__entry_versioned().

svn_wc__get_entry() has no hidden concept, so it is always like
SHOW_HIDDEN=TRUE, which the original code did.


On Wed, Oct 7, 2009 at 15:53, Greg Stein <gs...@gmail.com> wrote:
> On Wed, Oct 7, 2009 at 05:27, Bert Huijben <rh...@sharpsvn.net> wrote:
>>...
>> +++ trunk/subversion/libsvn_wc/log.c    Wed Oct  7 02:27:15 2009        (r39817)
>>...
>> @@ -597,8 +595,9 @@ log_do_modify_entry(struct log_runner *l
>>          which case we don't want to reincarnate it.  */
>>       const svn_wc_entry_t *existing;
>>
>> -      SVN_ERR(svn_wc_entry(&existing, tfile, loggy->adm_access, TRUE,
>> -                           loggy->pool));
>> +      SVN_ERR(svn_wc__get_entry(&existing, loggy->db, local_abspath, TRUE,
>> +                                svn_node_unknown, FALSE,
>> +                                loggy->pool, loggy->pool));
>
> Whoops. You changed the SHOW_HIDDEN param value here. Probably not a good idea.
>
>>...
>> @@ -896,9 +885,8 @@ log_do_committed(struct log_runner *logg
>>      entry, or if the entry states that our item is not either "this
>>      dir" or a file kind, perhaps this isn't really the entry our log
>>      creator was expecting.  */
>> -  SVN_ERR(svn_wc_adm_probe_retrieve(&adm_access, loggy->adm_access, full_path,
>> -                                    pool));
>> -  SVN_ERR(svn_wc_entry(&orig_entry, full_path, adm_access, TRUE, pool));
>> +  SVN_ERR(svn_wc__get_entry(&orig_entry, loggy->db, local_abspath, FALSE,
>> +                            svn_node_unknown, FALSE, pool, pool));
>
> Here is another change of the SHOW_HIDDEN parameter.
>
>>...
>
> Cheers,
> -g
>

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