Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1765159 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date: Sun, 16 Oct 2016 14:10:30 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20161016141030.6F5A43A0230@svn01-us-west.apache.org>
archived-at: Sun, 16 Oct 2016 14:10:36 -0000

Author: stsp
Date: Sun Oct 16 14:10:30 2016
New Revision: 1765159

URL: http://svn.apache.org/viewvc?rev=1765159&view=rev
Log:
Fix another pool lifetime bug in the conflict resolver.

* subversion/libsvn_client/conflicts.c
  (conflict_tree_get_details_incoming_delete): Pass the correct result pool
   to find_revision_for_suspected_deletion().

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1765159&r1=1765158&r2=1765159&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Oct 16 14:10:30 2016
@@ -3570,7 +3570,7 @@ conflict_tree_get_details_incoming_delet
                     svn_relpath_basename(new_repos_relpath, scratch_pool),
                     svn_relpath_dirname(new_repos_relpath, scratch_pool),
                     new_rev, old_rev, old_repos_relpath, old_rev, ctx,
-                    scratch_pool, scratch_pool));
+                    conflict->pool, scratch_pool));
           if (deleted_rev == SVN_INVALID_REVNUM)
             {
               /* We could not determine the revision in which the node was