Re: [PATCH] Coredump when javahl SVNClient::diff() called with diff-cmd set

2018-11-01 Thread Branko Čibej
On 29.10.2018 16:36, matthew.b...@nats.co.uk wrote: > Prevent some coredumps when using JavaHL SVNClient::diff() > > SVNClient::diff() discards output to stderr by setting stderr parameters to > NULL in some calls > > Some of the called code can dereference the NULL in some situations. One > such

Re: [PATCH] Suppress conflict resolver in dry-run merge

2018-11-01 Thread Jonathan Guy
Ok I looked into this a bit more and I see what's going on now. The post merge conflict resolver runs because the merge operation reported conflicts (via the conflict stats). This calls svn_client_conflict_walk which calls svn_wc_walk_status which reports no conflict at that pat

Re: svn commit: r1845438 - /subversion/branches/1.9.x/STATUS

2018-11-01 Thread Branko Čibej
On 01.11.2018 11:31, rhuij...@apache.org wrote: > Author: rhuijben > Date: Thu Nov 1 10:31:51 2018 > New Revision: 1845438 > > URL: http://svn.apache.org/viewvc?rev=1845438&view=rev > Log: > * STATUS: Cast some votes. Approves several groups (one via binding rules) [...] > Approved changes: >

Re: [PATCH] Proof of concept of the better-pristines (LZ4 + storing small pristines as BLOBs) (Was: Re: svn commit: r1843076)

2018-11-01 Thread Branko Čibej
On 22.10.2018 22:14, Evgeny Kotkov wrote: > @@ -104,9 +103,13 @@ > CREATE TABLE PRISTINE ( > ··/*·Alternative·MD5·checksum·used·for·communicating·with·older > ·repositories.·Not·strictly·guaranteed·to·be·unique·among·table·rows.·*/ > > -··md5_checksum··TEXT·NOT·NULL > +··md5_checksum··TEXT·NOT

Re: [PATCH] Suppress conflict resolver in dry-run merge

2018-11-01 Thread Stefan Sperling
On Thu, Nov 01, 2018 at 10:32:56AM +, Jonathan Guy wrote: > Ok I looked into this a bit more and I see what's going on now. > The post merge conflict resolver runs because the merge operation reported > conflicts (via the conflict stats). > This calls > svn_client_conflict_walk > which

Re: [PATCH] Suppress conflict resolver in dry-run merge

2018-11-01 Thread Branko Čibej
On 01.11.2018 17:25, Stefan Sperling wrote: > On Thu, Nov 01, 2018 at 10:32:56AM +, Jonathan Guy wrote: >> Ok I looked into this a bit more and I see what's going on now. >> The post merge conflict resolver runs because the merge operation reported >> conflicts (via the conflict stats). >> Thi

Re: svn commit: r1845378 - /subversion/trunk/CHANGES

2018-11-01 Thread Daniel Shahaf
Branko Čibej wrote on Wed, 31 Oct 2018 21:10 +0100: > On 31.10.2018 21:08, Daniel Shahaf wrote: > > Other issue: In the three months centered on the 1.12.0 release we'll be > > supporting 1.9, 1.10, 1.11, 1.12, and trunk in parallel, so I think we > > should reduce the CHANGES management effort. T