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 2014/09/10 18:01:14 UTC

svn commit: r1624047 - /subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c

Author: stsp
Date: Wed Sep 10 16:01:13 2014
New Revision: 1624047

URL: http://svn.apache.org/r1624047
Log:
On the log-message-templates branch:

* subversion/libsvn_client/commit_util.c
  (svn_client_get_log_message_templates_for_commit_items): Don't allocate
   and add a template for a given defining_repos_relpath multiple times.

Modified:
    subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c

Modified: subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c?rev=1624047&r1=1624046&r2=1624047&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c (original)
+++ subversion/branches/log-message-templates/subversion/libsvn_client/commit_util.c Wed Sep 10 16:01:13 2014
@@ -2125,7 +2125,9 @@ svn_client_get_log_message_templates_for
                                                   path_or_url, &peg_revision,
                                                   &revision, NULL, ctx,
                                                   iterpool, iterpool));
-      if (log_message_template)
+      if (log_message_template &&
+          svn_hash_gets(*log_message_templates,
+                        defining_repos_relpath) == NULL)
         svn_hash_sets(*log_message_templates,
                       apr_pstrdup(result_pool, defining_repos_relpath),
                       apr_pstrdup(result_pool, log_message_template));