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

Re: [BUG] Manual conflict removal leads to spurious revert report

From: Branko Čibej <brane_at_xbc.nu>
Date: 2006-03-08 04:46:02 CET

Ed Price wrote:
> Index: subversion/libsvn_wc/adm_ops.c
> ===================================================================
> --- subversion/libsvn_wc/adm_ops.c (revision 18758)
> +++ subversion/libsvn_wc/adm_ops.c (working copy)
> @@ -1384,6 +1384,7 @@
> SVN_ERR(svn_wc__loggy_remove
> (&log_accum, adm_access,
> svn_path_is_child(adm_path, rprop, pool), pool));
> + *reverted = TRUE;
> }
> }
>
> @@ -1426,6 +1427,7 @@
> {
> flags |= SVN_WC__ENTRY_MODIFY_COPIED;
> tmp_entry.copied = FALSE;
> + *reverted = TRUE;
> }
>
> /* Deal with the contents. */
> @@ -1494,6 +1496,8 @@
> SVN_ERR(svn_wc__loggy_set_entry_timestamp_from_wc
> (&log_accum, adm_access, name, SVN_WC__ENTRY_ATTR_TEXT_TIME,
> pool));
> +
> + *reverted = TRUE;
> }
> }
>
> @@ -1537,6 +1541,7 @@
> {
> flags |= SVN_WC__ENTRY_MODIFY_SCHEDULE;
> tmp_entry.schedule = svn_wc_schedule_normal;
> + *reverted = TRUE;
> }
>
> SVN_ERR(svn_wc__loggy_entry_modify(&log_accum, adm_access, name,
> @@ -1547,13 +1552,7 @@
> {
> SVN_ERR(svn_wc__write_log(adm_access, 0, log_accum, pool));
> SVN_ERR(svn_wc__run_log(adm_access, NULL, pool));
> -
> - *reverted = TRUE;
> }
> - else
> - {
> - *reverted = FALSE;
> - }
>
> return SVN_NO_ERROR;
> }
>
This change can leave *reverted in an indeterminate state. That changed
the behaviour of the function, since it always set *reverted to either
TRUE or FALSE before (unless it returned an error). I haven't checked if
that actually created problems, but I suspect it's wrong that *reverted
never gets set to FALSE with this patch.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 8 04:46:23 2006

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