Author: stsp Date: Wed May 22 12:34:32 2013 New Revision: 1485189 URL: http://svn.apache.org/r1485189 Log: On the 1.7.x branch, merge r1483781.
* r1483781 Fix FSFS repository corruption on power or network disk failure on Windows: http://svn.haxx.se/dev/archive-2013-05/0245.shtml Justification: Repository corruption. Regression from 1.6.x Votes: +1: ivan, blair, stsp Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_subr/io.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1483781 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1485189&r1=1485188&r2=1485189&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed May 22 12:34:32 2013 @@ -274,11 +274,3 @@ Veto-blocked changes: Approved changes: ================= - -* r1483781 - Fix FSFS repository corruption on power or network disk failure on Windows: - http://svn.haxx.se/dev/archive-2013-05/0245.shtml - Justification: - Repository corruption. Regression from 1.6.x - Votes: - +1: ivan, blair, stsp Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/io.c?rev=1485189&r1=1485188&r2=1485189&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_subr/io.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_subr/io.c Wed May 22 12:34:32 2013 @@ -3250,17 +3250,8 @@ svn_io_write_unique(const char **tmp_pat err = svn_io_file_write_full(new_file, buf, nbytes, NULL, pool); - /* ### BH: Windows doesn't have the race condition between the write and the - ### rename that other operating systems might have. So allow windows - ### to decide when it wants to perform the disk synchronization using - ### the normal file locking and journaling filesystem rules. - - ### Note that this function doesn't handle the rename, so we aren't even - ### sure that we really have to sync. */ -#ifndef WIN32 - if (!err && nbytes > 0) + if (!err) err = svn_io_file_flush_to_disk(new_file, pool); -#endif return svn_error_trace( svn_error_compose_create(err,
