You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/06/24 16:25:29 UTC
svn commit: r957554 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: philip
Date: Thu Jun 24 14:25:29 2010
New Revision: 957554
URL: http://svn.apache.org/viewvc?rev=957554&view=rev
Log:
Fix over 40 regression tests when SVN_EXPERIMENTAL_PRISTINE is
enabled, there are now about 12 FAILs.
* subversion/libsvn_wc/update_editor.c
(close_file): Track the name of the new pristine file as it is installed.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=957554&r1=957553&r2=957554&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Jun 24 14:25:29 2010
@@ -4690,10 +4690,16 @@ close_file(void *file_baton,
checksum. In the old WC-1 way, installation of this file happens later
(in merge_file()) as a single move into place, being part of the loggy
action of updating the WC metadata. */
- if (fb->new_text_base_tmp_abspath)
- SVN_ERR(svn_wc__db_pristine_install(eb->db, fb->new_text_base_tmp_abspath,
- new_text_base_sha1_checksum,
- new_text_base_md5_checksum, pool));
+ if (new_text_base_abspath)
+ {
+ SVN_ERR(svn_wc__db_pristine_install(eb->db, new_text_base_abspath,
+ new_text_base_sha1_checksum,
+ new_text_base_md5_checksum, pool));
+ SVN_ERR(svn_wc__db_pristine_get_path(&new_text_base_abspath, eb->db,
+ fb->local_abspath,
+ new_text_base_sha1_checksum,
+ pool, pool));
+ }
#endif
SVN_ERR(svn_wc_read_kind(&kind, eb->wc_ctx, fb->local_abspath, TRUE, pool));