You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2003/04/15 19:21:49 UTC
Did this slip through the net?
Hello
The log for 5387 contains
(do_single_file_merge): discover mimetypes in the two fetched
proplists, pass them to merge_file_changed.
but the code (libsvn_client/diff.c:1065) then and now does
/* Discover any svn:mime-type values in the proplists */
pval = apr_hash_get (props1, SVN_PROP_MIME_TYPE, strlen(SVN_PROP_MIME_TYPE));
mimetype1 = pval ? pval->data : NULL;
pval = apr_hash_get (props2, SVN_PROP_MIME_TYPE, strlen(SVN_PROP_MIME_TYPE));
mimetype2 = pval ? pval->data : NULL;
SVN_ERR (merge_file_changed (adm_access,
&text_state,
merge_b->target,
tmpfile1,
tmpfile2,
rev1,
rev2,
NULL, NULL, /* ### TODO: pass real mimetypes */
merge_b));
Any reason those mime types are not used? Ben?
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Did this slip through the net?
Posted by Ben Collins-Sussman <su...@collab.net>.
Philip Martin <ph...@codematters.co.uk> writes:
> Any reason those mime types are not used? Ben?
One word: doh!!!
Thanks for noticing Philip, please finish the ###todo there. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Did this slip through the net?
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Apr 15, 2003 at 08:21:49PM +0100, Philip Martin wrote:
> Hello
>
> The log for 5387 contains
>
> (do_single_file_merge): discover mimetypes in the two fetched
> proplists, pass them to merge_file_changed.
>
> but the code (libsvn_client/diff.c:1065) then and now does
>
> /* Discover any svn:mime-type values in the proplists */
> pval = apr_hash_get (props1, SVN_PROP_MIME_TYPE, strlen(SVN_PROP_MIME_TYPE));
> mimetype1 = pval ? pval->data : NULL;
>
> pval = apr_hash_get (props2, SVN_PROP_MIME_TYPE, strlen(SVN_PROP_MIME_TYPE));
> mimetype2 = pval ? pval->data : NULL;
Not to mention that those lines should use APR_HASH_KEY_STRING.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org