[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 15:17:52 CET

Ed Price wrote:
>> This change can leave *reverted in an indeterminate state. That changed
>>
>
> Not really. This is not a public API and the function is only called from
> svn_wc_revert2, which does initialize the reverted flag to FALSE.
>
Ah, good, I didn't notice that.

>> 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.
>>
>
> That's a reasonable concern but it is actually ok.
>
> The previous code would overwrite the initial value, which isn't
> necessarily correct either. Note that the comment on the function
> says that it sets the flag *if something is reverted*. It does not say
> that it sets the flag according to *whether something is reverted*.
> So now the comment is correct :)
>
Heh. It would be good if the comment was a bit more specific, though.

-- 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 15:19:15 2006

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