You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/05/11 01:06:35 UTC

svn commit: r1336941 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rhuijben
Date: Thu May 10 23:06:35 2012
New Revision: 1336941

URL: http://svn.apache.org/viewvc?rev=1336941&view=rev
Log:
* subversion/libsvn_client/merge.c
  (do_directory_merge): Mark error leak.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1336941&r1=1336940&r2=1336941&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu May 10 23:06:35 2012
@@ -8764,6 +8764,7 @@ do_directory_merge(svn_mergeinfo_catalog
     {
       const char *mergeinfo_path;
 
+      /* ### Leaks merge_conflict_err */
       SVN_ERR(svn_ra__get_fspath_relative_to_root(ra_session, &mergeinfo_path,
                                                   primary_url, scratch_pool));
       err = record_mergeinfo_for_dir_merge(result_catalog,