dionisos_at_tigris.org writes:
> --- trunk/subversion/libsvn_wc/update_editor.c Sat Mar 22 07:33:07 2008 (r30008)
> +++ trunk/subversion/libsvn_wc/update_editor.c Sat Mar 22 13:54:37 2008 (r30009)
> @@ -2621,8 +2621,10 @@ merge_file(svn_wc_notify_state_t *conten
> SVN_ERR(svn_wc__loggy_entry_modify(&log_accum, adm_access,
> fb->path, &tmp_entry, flags, pool));
>
> - /* Log commands to handle text-timestamp and working-size */
> - if (!is_locally_modified)
> + /* Log commands to handle text-timestamp and working-size,
> + if the file is - or will be - unmodified and schedule-normal */
> + if (!is_locally_modified &&
> + (fb->added || entry->schedule == svn_wc_schedule_normal))
> {
> /* Adjust working copy file unless this file is an allowed
> obstruction. */
Shouldn't it be
(!is_locally_modified &&
(fb->added
|| fb->added_with_history
|| entry->schedule == svn_wc_schedule_normal))
? That is, don't we need to accept the 'replaced' case too?
(By the way, I think 'struct file_baton' under-documents its 'added'
field, since it's not entirely clear whether 'added_with_history' always
implies 'added', or whether the former can be true while the latter is
false.)
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-23 00:22:48 CET