svn commit: r959138 - /subversion/trunk/subversion/libsvn_wc/node.c

[rh...@apache.org]

Author: rhuijben
Date: Tue Jun 29 23:07:45 2010
New Revision: 959138

URL: http://svn.apache.org/viewvc?rev=959138&view=rev
Log:
* subversion/libsvn_wc/node.c
  (svn_wc__node_get_copyfrom_info): Following up on r959112, fix some pool
    lifetime issues and also enable the scan addition block when only the new
    arguments are required.

Modified:
    subversion/trunk/subversion/libsvn_wc/node.c

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=959138&r1=959137&r2=959138&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Jun 29 23:07:45 2010
@@ -489,7 +489,7 @@ svn_wc__node_get_copyfrom_info(const cha
                                NULL, &original_repos_relpath,
                                &original_root_url, NULL, &original_revision,
                                NULL, NULL, NULL, NULL, NULL, db,
-                               local_abspath, scratch_pool, scratch_pool));
+                               local_abspath, result_pool, scratch_pool));
   if (original_root_url && original_repos_relpath)
     {
       /* If this was the root of the copy then the URL is immediately
@@ -552,7 +552,8 @@ svn_wc__node_get_copyfrom_info(const cha
     }
   else if ((status == svn_wc__db_status_added
             || status == svn_wc__db_status_obstructed_add)
-           && (copyfrom_rev || copyfrom_url))
+           && (copyfrom_rev || copyfrom_url || copyfrom_root_url
+               || copyfrom_repos_relpath))
     {
       /* ...But if this is merely the descendant of an explicitly
          copied/moved directory, we need to do a bit more work to
@@ -563,7 +564,7 @@ svn_wc__node_get_copyfrom_info(const cha
                                        NULL, &original_repos_relpath,
                                        &original_root_url, NULL,
                                        &original_revision, db, local_abspath,
-                                       scratch_pool, scratch_pool));
+                                       result_pool, scratch_pool));
       if (status == svn_wc__db_status_copied ||
           status == svn_wc__db_status_moved_here)
         {