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 2010/05/18 21:11:30 UTC

svn commit: r945829 - /subversion/trunk/subversion/libsvn_wc/diff.c

Author: stsp
Date: Tue May 18 19:11:29 2010
New Revision: 945829

URL: http://svn.apache.org/viewvc?rev=945829&view=rev
Log:
Follow-up to r945788, fix the build.

* subversion/libsvn_wc/diff.c
  (delete_entry, close_file): Call the new function
   svn_wc__get_working_node_pristine_file() with the correct number
   of pool parameters.

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

Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=945829&r1=945828&r2=945829&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue May 18 19:11:29 2010
@@ -1207,7 +1207,7 @@ delete_entry(const char *path,
 
           SVN_ERR(svn_wc__get_working_node_pristine_file(&textbase,
                                                          eb->db, local_abspath,
-                                                         pool, pool));
+                                                         pool));
 
           SVN_ERR(svn_wc__get_pristine_props(&baseprops, eb->db, local_abspath,
                                              pool, pool));
@@ -1578,7 +1578,7 @@ close_file(void *file_baton,
   if (!temp_file_path)
     SVN_ERR(svn_wc__get_working_node_pristine_file(&temp_file_path,
                                                    eb->db, fb->local_abspath,
-                                                   fb->pool, fb->pool));
+                                                   fb->pool));
 
   /* If the file isn't in the working copy (either because it was added
      in the BASE->repos diff or because we're diffing against WORKING
@@ -1643,7 +1643,7 @@ close_file(void *file_baton,
       if (eb->use_text_base)
         SVN_ERR(svn_wc__get_working_node_pristine_file(&localfile, eb->db,
                                                        fb->local_abspath,
-                                                       fb->pool, fb->pool));
+                                                       fb->pool));
       else
         /* a detranslated version of the working file */
         SVN_ERR(svn_wc__internal_translated_file(