Erik, does this need to be backported to the 1.4.x branch? (It
doesn't apply cleanly, but that doesn't mean that it doesn't need a
backport.)
On Wed, 21 Mar 2007, dionisos@tigris.org wrote:
> Author: dionisos
> Date: Wed Mar 21 10:03:38 2007
> New Revision: 23959
>
> Log:
> Resolve issue #1743: Inconsistent expandsion of $Id$ keyword.
>
> * subversion/libsvn_wc/update_editor.c
> (merge_file): Check whether we have keywords. This may require
> retranslation regardless of content or magic props changes.
>
>
> Modified:
> trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/update_editor.c?pathrev=23959&r1=23958&r2=23959
> ==============================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ trunk/subversion/libsvn_wc/update_editor.c Wed Mar 21 10:03:38 2007
> @@ -2314,11 +2314,20 @@
> } /* end: "textual" merging process */
> else
> {
> - if (magic_props_changed) /* no new text base, but... */
> + apr_hash_t *keywords;
> +
> + SVN_ERR(svn_wc__get_keywords(&keywords, fb->path,
> + adm_access, NULL, pool));
> + if (magic_props_changed || keywords)
> + /* no new text base, but... */
> {
> /* Special edge-case: it's possible that this file installation
> only involves propchanges, but that some of those props still
> - require a retranslation of the working file. */
> + require a retranslation of the working file.
> +
> + OR that the file doesn't involve propchanges which by themselves
> + require retranslation, but receiving a change bumps the revision
> + number which requires re-expansion of keywords... */
>
> const char *tmptext;
>
- application/pgp-signature attachment: stored
Received on Wed Mar 21 18:30:12 2007