RE: svn commit: r1730546 - in /subversion/trunk/subversion:include/private/svn_wc_private.h libsvn_client/resolved.clibsvn_wc/conflicts.c
From: Bert Huijben <bert_at_qqmail.nl>
Date: Mon, 15 Feb 2016 23:31:22 +0100
There shouldn’t be many cases where the wait is necessary, if any… Resolving a conflict never involves changing BASE and typically we already waited before invoking the resolver. So this could be as simple as just removing the waits. (I can’t really think of a case in tree/property conflicts where this would be needed. Perhaps some hard tree conflict resolve step would be an exception)
I was surprised to see that we have waits… and the functions that have the wait now are probably too low level to have the wait. An invocation of an svn_client api should have just 1 sleep, even on recursive operations.
Bert
Sent from Mail for Windows 10
From: Stefan Sperling
On Mon, Feb 15, 2016 at 05:30:55PM +0100, Bert Huijben wrote:
I agree that this should be fixed.
I'd like to spend some more time exploring the new APIs before addressing
Please feel free to fix this yourself.
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.