[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r948108 - /subversion/trunk/subversion/libsvn_wc/workqueue.c

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Tue, 25 May 2010 18:31:14 +0100

julianfoad_at_apache.org writes:

> Author: julianfoad
> Date: Tue May 25 17:02:10 2010
> New Revision: 948108
>
> URL: http://svn.apache.org/viewvc?rev=948108&view=rev
> Log:
> Implement the Pristine Store version of one more function, conditional on
> SVN_EXPERIMENTAL_PRISTINE.
>
> * subversion/libsvn_wc/workqueue.c
> (log_do_committed): Never get the file's time stamp from the text base.
>
> 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=948108&r1=948107&r2=948108&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue May 25 17:02:10 2010
> @@ -1439,6 +1439,11 @@ 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? */

The timestamp that gets recorded is not simply the timestamp of the
working file, it is the timestamp when the working file contents were
known to be equal to the pristine contents. If the working file
contents are not equal to the pristine contents then the timestamps
should not be equal.

> +#else
> if (overwrote_working)
> {
> last_mod_time = finfo.mtime;
> @@ -1480,6 +1485,7 @@ 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,
>
>

-- 
Philip
Received on 2010-05-25 19:32:17 CEST

This is an archived mail posted to the Subversion Dev mailing list.