Re: [PATCH] Correct indentation in svn_client_conflict_text_resolve_by_id

2016-11-10 Thread Stefan Sperling
On Wed, Nov 09, 2016 at 11:21:42PM +0100, Stefan wrote: > Hi, > > attached is a patch to correct indentation in > svn_client_conflict_text_resolve_by_id() which was spotted by Evgeny > (related to the mail thread: "svn commit: r1764902 - in > /subversion/trunk/subversion: libsvn_client/conflicts.c

Re: svn commit: r1764902 - in /subversion/trunk/subversion: libsvn_client/conflicts.c svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

2016-11-10 Thread Stefan Sperling
On Fri, Oct 14, 2016 at 06:24:05PM +0200, Evgeny Kotkov wrote: > As for the change itself, I don't think that silently transforming one > conflict option id to another in svn_client_conflict_text_resolve_by_id() > API is a proper thing to do, because we don't expose this option id as a > viable res

Re: svn commit: r1764902 - in /subversion/trunk/subversion: libsvn_client/conflicts.c svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

2016-11-10 Thread Evgeny Kotkov
Stefan Sperling writes: > There's a similar hack for resolving tree-conflicts with --mine-conflict, > which the client API does not expose as a valid option either. > > I'd say leave these as-is. We won't accumulate more such hacks. They > are clearly marked as hacks in comments, and they exist o

Re: svn commit: r1764902 - in /subversion/trunk/subversion: libsvn_client/conflicts.c svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

2016-11-10 Thread Stefan Sperling
On Thu, Nov 10, 2016 at 07:34:09PM +0300, Evgeny Kotkov wrote: > Here is the patch. Not sure that I fully understand the point about the > number of iterations, though ;) Ah, yes. I see what you're doing. Unravelling the accept arg during the conflict walk instead of before the walk is very nice.

Re: [PATCH] Correct indentation in svn_client_conflict_text_resolve_by_id

2016-11-10 Thread Stefan
On 11/10/2016 10:07, Stefan Sperling wrote: > On Wed, Nov 09, 2016 at 11:21:42PM +0100, Stefan wrote: >> Hi, >> >> attached is a patch to correct indentation in >> svn_client_conflict_text_resolve_by_id() which was spotted by Evgeny >> (related to the mail thread: "svn commit: r1764902 - in >> /sub

Re: [PATCH] Correct indentation in svn_client_conflict_text_resolve_by_id

2016-11-10 Thread Daniel Shahaf
Stefan wrote on Thu, Nov 10, 2016 at 23:05:18 +0100: > On 11/10/2016 10:07, Stefan Sperling wrote: > > On Wed, Nov 09, 2016 at 11:21:42PM +0100, Stefan wrote: > >> Hi, > >> > >> attached is a patch to correct indentation in > >> svn_client_conflict_text_resolve_by_id() which was spotted by Evgeny >

Re: [PATCH] Correct indentation in svn_client_conflict_text_resolve_by_id

2016-11-10 Thread Stefan
On 11/10/2016 23:37, Daniel Shahaf wrote: > Stefan wrote on Thu, Nov 10, 2016 at 23:05:18 +0100: >> On 11/10/2016 10:07, Stefan Sperling wrote: >>> On Wed, Nov 09, 2016 at 11:21:42PM +0100, Stefan wrote: Hi, attached is a patch to correct indentation in svn_client_conflict_text_

Re: svn commit: r1764902 - in /subversion/trunk/subversion: libsvn_client/conflicts.c svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

2016-11-10 Thread Evgeny Kotkov
Stefan Sperling writes: > So basically the 1.10 svn client is now doing the reverse-mapping of > conflict_option_id_to_wc_conflict_choice() in libsvn_client/conflicts.c > with some extra tweaks. > Perhaps other clients than the command line client won't have such > problems, because they can adap

Re: mod_authz_svn and caching

2016-11-10 Thread Branko Čibej
On 06.11.2016 13:47, Stefan Fuhrmann wrote: > On 05.11.2016 17:51, Hans van Kranenburg wrote: >> I don't see noticable performance issues at all while reparsing the >> little files every time right now (how big/complex is the average authz >> file?) > > I remember generated authz files > 10MB. Tha