You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/08/21 14:07:05 UTC

svn commit: r987735 - /subversion/trunk/subversion/libsvn_client/patch.c

Author: stsp
Date: Sat Aug 21 12:07:05 2010
New Revision: 987735

URL: http://svn.apache.org/viewvc?rev=987735&view=rev
Log:
* subversion/libsvn_client/patch.c
  (install_patched_prop_targets): In a comment, suggest a better approach
   to tackling invalid properties in patches. Fixing this problem would make
   the last remaining XFail patch test pass.

Modified:
    subversion/trunk/subversion/libsvn_client/patch.c

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=987735&r1=987734&r2=987735&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Sat Aug 21 12:07:05 2010
@@ -2257,7 +2257,10 @@ install_patched_prop_targets(patch_targe
        * ### SVN_ERR_BAD_MIME_TYPE?
        *
        * ### stsp: I'd say skip the target, patch is illegal.
-       * ###       Revert any changes already made to file content, too! */
+       * ###       We should verify all modified prop hunk texts using
+       * ###       svn_wc_canonicalize_svn_prop() before starting
+       * ###       the patching process, to skip the target as early
+       * ###       as possible. */
       SVN_ERR(svn_wc_prop_set4(ctx->wc_ctx, target->local_abspath,
                                prop_target->name,
                                svn_string_create_from_buf(prop_content,