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

Re: svn commit: r1097635 - /subversion/trunk/subversion/libsvn_wc/questions.c

From: Greg Stein <gstein_at_gmail.com>
Date: Sun, 1 May 2011 20:16:01 -0400

On Thu, Apr 28, 2011 at 18:01, <rhuijben_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/questions.c Thu Apr 28 22:01:39 2011
>...
> @@ -314,15 +318,32 @@ svn_wc__internal_file_modified_p(svn_boo
>   if (read_only_p)
>     SVN_ERR(svn_io__is_finfo_read_only(read_only_p, &finfo, scratch_pool));
>
> -  if (! force_comparison)
> +  /* Read the relevant info */
> +  SVN_ERR(svn_wc__db_read_info(&status, &kind, NULL, NULL, NULL, NULL, NULL,
> +                               NULL, NULL, NULL, &checksum, NULL, NULL, NULL,
> +                               NULL, NULL, NULL,
> +                               &recorded_size, &recorded_mod_time,
> +                               NULL, NULL, NULL, &has_props, &props_mod,
> +                               NULL, NULL, NULL,
> +                               db, local_abspath,
> +                               scratch_pool, scratch_pool));
> +
> +  /* If we don't have a pristine or the node has a status that allows a
> +     pristine, just say that the node is modified */
> +  if (!checksum
> +      || (kind != svn_wc__db_kind_file)
> +      || ((status != svn_wc__db_status_normal)
> +          && (status != svn_wc__db_status_added)))
>     {

That comment doesn't seem to match the if-condition. Did you mean a
status that does NOT allow for a pristine?

And does the kind check have to be there? Dir and symlink types would
not have a checksum, right?

>...

Cheers,
-g
Received on 2011-05-02 02:16:28 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.