Re: "not under version control" error - continued

Ben Collins-Sussman <sussman@collab.net> writes:

> /* Don't do the props_changed stuff if this is a dry_run and we don't
> have an access baton, since in that case the file will already have
> been recognised as added, in which case they cannot conflict. A

The problem case is "dry run and added", and in this case the
props_changed stuff should be avoided.

> similar argument applies to directories in close_directory. */
> if (b->propchanges->nelts > 0 && (! eb->dry_run || adm_access))
> {
> SVN_ERR (eb->diff_callbacks->props_changed
> (adm_access, &prop_state,
> b->wcpath,
> b->propchanges, b->pristine_props,
> b->edit_baton->diff_cmd_baton));
> }
>
> I made a tiny patch to this condition:
>
> - if (b->propchanges->nelts > 0 && (! eb->dry_run || adm_access))
> + if (b->propchanges->nelts > 0 && (! eb->dry_run) && adm_access)
>
> ...and it fixes the problem, but causes merge_test #4 to fail. What's
> the correct logic here? Philip? Anyone?

How about

  if (b->propchanges->nelts > 0 && (! (eb->dry_run && b->added)))

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org