Author: julianfoad
Date: Wed May 26 09:47:43 2010
New Revision: 948379
URL: http://svn.apache.org/viewvc?rev=948379&view=rev
Log:
Revert r948108, an SVN_EXPERIMENTAL_PRISTINE change, as it was wrong. The
reason I did it had also already been made obsolete by r947744.
* subversion/libsvn_wc/workqueue.c
(log_do_committed): Use the full original code path for determining the
'last mod time' to store.
Suggested by: philipm
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=948379&r1=948378&r2=948379&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Wed May 26 09:47:43 2010
@@ -1439,11 +1439,6 @@ log_do_committed(svn_wc__db_t *db,
translated_size = finfo.size;
-#ifdef SVN_EXPERIMENTAL_PRISTINE
- last_mod_time = finfo.mtime;
- /* ### Should we choose a different time stamp if the working copy
- hasn't been overwritten, like WC-1 did? Why did it do so? */
-#else
if (overwrote_working)
{
last_mod_time = finfo.mtime;
@@ -1485,7 +1480,6 @@ log_do_committed(svn_wc__db_t *db,
else use the base file's timestamp. */
last_mod_time = modified ? basef_finfo.mtime : finfo.mtime;
}
-#endif
return svn_error_return(svn_wc__db_global_record_fileinfo(
db, local_abspath,
