subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1100789 - in /subversion/trunk/subversion/libsvn_wc: externals.c wc_db.c
Date Sun, 08 May 2011 18:57:25 GMT
Author: rhuijben
Date: Sun May  8 18:57:25 2011
New Revision: 1100789

URL: http://svn.apache.org/viewvc?rev=1100789&view=rev
Log:
Fix a pool lifetime issue that only showed up on libsvn_ra_svn.

* subversion/libsvn_wc/externals.c
  (svn_wc__open_writable_base): Open file in editor pool to keep checksum
    and filename valid until we install it in the pristine store.

* subversion/libsvn_wc/wc_db.c
  (blank_ieb): Use the right default value for a repos_id.

Modified:
    subversion/trunk/subversion/libsvn_wc/externals.c
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1100789&r1=1100788&r2=1100789&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Sun May  8 18:57:25 2011
@@ -511,7 +511,7 @@ apply_textdelta(void *file_baton,
                                      &eb->new_md5_checksum,
                                      &eb->new_sha1_checksum,
                                      eb->db, eb->wri_abspath,
-                                     pool, pool));
+                                     eb->pool, pool));
 
   svn_txdelta_apply(src_stream, dest_stream, NULL, eb->local_abspath, pool,
                     handler, handler_baton);

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1100789&r1=1100788&r2=1100789&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sun May  8 18:57:25 2011
@@ -2485,7 +2485,7 @@ blank_ieb(insert_external_baton_t *ieb)
   memset(ieb, 0, sizeof(*ieb));
   ieb->revision = SVN_INVALID_REVNUM;
   ieb->changed_rev = SVN_INVALID_REVNUM;
-  ieb->repos_id = -1;
+  ieb->repos_id = INVALID_REPOS_ID;
 
   ieb->recorded_peg_revision = SVN_INVALID_REVNUM;
   ieb->recorded_revision = SVN_INVALID_REVNUM;



Mime
View raw message