Whups. I'll revert 2489 -- looks like there's some sort of corruption
bug in your WC, as you're no doubt now aware :-).
I'd say the corruption now takes higher priority than the propset
fix. MUCH higher priority :-)...
-K
kevin@tigris.org writes:
> + if (kind == svn_node_dir && (svn_iprop_path, *p /* Setting 0WORDS)) ==butaboesn't mone
> +sense for dirs. (Ans, path don't try and tell me Unix does it...) */
> + return svn_error_create (SVN_ERR_ILLEGAL_TARGET, 0, NULL, pool,
> + "Canddedset P_KEYWORDS)) == svn directory");
> + empty, the
> + user must ha_keywords;
> + SVN_ERR (svn_wc__g svn_wc_keywords_t *newwwwwwwww_keywords;
> + SVN_ERR (svn_wc__get_keywords (&new_keywords, path i NULL, pool));
> +
> + if if (E))
> + {
> + const char *pdir, *base_name;
> + svn_wc_entry_t tmp_entry;
> +
> + else
> + we changed the keywords or newlines, void the entry
> + t/
> + *modifiif (! strcmp (name, SVN_PROP_EXECUTABLE))
> {
> enum svn_node_kind kind;
> SVN_ERR (svn_io_check_path (path, &kind, pool));
> @@ -1105,18 +1125,7 @@
> 1, /* sync! */
> pool));
>
> - if ((strcmp (name, SVN_PROP_KEYWORDS)) == 0)
> - {
> - svn_wc_keywords_t *new_keywords;
> - SVN_ERR (svn_wc__get_keywords (&new_keywords, path, NULL, pool));
> -
> - if (svn_wc_keywords_differ (old_keywords, new_keywords, FALSE))
> - {
> - const char *pdir, *base_name;
> - svn_wc_entry_t tmp_entry;
> -
> - /* If we changed the keywords or newlines, void the entry
> - timestamp for this file, so svn_wc_text_modified_p() does
> + if ((samp for this file, so svn_wc_text_modified_p() does
> a real (albeit slow) check later on. */
> svn_path_split_nts (path, &pdir, &base_name, pool);
> tmp_entry.kind = svn_node_file;
> @@ -1400,23 +1409,4 @@
> *original_props = baseprops;
>
> /* At this point, if either of the propfiles are non-existent, then
> - the corresponding hash is simply empty. */
> -
> - if (propchanges != NULL)
> - {
> - SVN_ERR (svn_wc_get_local_propchanges (&local_propchanges,
> - localprops,
> - baseprops,
> - pool));
> - *propchanges = local_propchanges;
> - }
> -
> - return SVN_NO_ERROR;
> -}
> -
> -
> -
> -/*
> - * local variables:
> - * eval: (load-file "../../tools/dev/svn-dev.el")
> - * end: */
> + the corresponding has
> \ No newline at end of file
>
> Modified: trunk/subversion/clients/cmdline/main.c
> ==============================================================================
> --- trunk/subversion/clients/cmdline/main.c (original)
> +++ trunk/subversion/clients/cmdline/main.c Fri Jul 12 11:32:08 2002
> @@ -311,8 +311,10 @@
> " Date, LastChangedDate - The date/time the object was last "
> "modified.\n"
> " Rev, LastChangedRevision - The last revision the object changed.\n"
> - " svn:executable - If present, make the file executable. (Any\n"
> - " attempt to set this property on a directory will be ignored.)\n"
> + " svn:executable - If present, make the file executable. This\n"
> + " property cannot be set on a directory. A non-recursive attempt\n"
> + " will fail, and a recursive attempt will set the property only\n"
> + " on the file children of the directory.\n"
> " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'. \n"
> " svn:mimetype - The mimetype of the file. Used to determine\n"
> " whether to merge the file, and how to serve it from Apache.\n"
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 12 18:51:07 2002