Re: Possible incompatibility of svn_repos_verify_fs2() in 1.9.0-rc1

2015-06-27 Thread Branko Čibej
On 26 Jun 2015 5:25 pm, "Evgeny Kotkov" wrote: > > Branko Čibej writes: > > > I like this a lot. Much better than my hacks upon hacks. :) > > > > Please go ahead and commit this. As you said, JavaHL would break after > > this change. If you like, I can fix it afterwards, but I'm on a rather > > t

Re: svn commit: r1687906 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c

2015-06-27 Thread Bert Huijben
Another reason to do this in libsvn_wc is that we need to retry resolving conflicts, as some conflicts might be in the way of others. The global retry as implemented here also has the side effect of hiding certain error types around these retries. (See changes of the libsvn wc version) Just pr

Re: svn commit: r1687906 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c

2015-06-27 Thread Bert Huijben
The problem you describe in the conflict walker of libsvn_wc is already fixed in the 1.9 codebase. And if not we should fix it there. A bigger problem was that it even forgot to report new conflicts deep below the current node, in case the node type changed. But all of that was already fixed b