On 10/12/2016 12:58 PM, Ivan Zhakov wrote: > On 12 October 2016 at 12:48, Stefan <luke1...@gmx.de> wrote: >> Hi, >> >> hope this patch is correct... As far as I see the number of elements is >> off by one here: >> >> [[[ >> Allocate the correct number of element entries. >> >> * subversion/libsvn_client/conflicts.c >> (svn_client_conflict_text_get_resolution_options): Correct number of array >> entires. >> ]]] > I think that log message could be improvement: because this not the > number of how many entries is allocated. This is initial size of > array, and apr_array will expand it if needed. Rephrased: [[[ Set the initial number of array elements to correspond to the maximum number we will need.
* subversion/libsvn_client/conflicts.c (svn_client_conflict_text_get_resolution_options): Change number of initial array size. ]]] > > > PS: Please submit patches with text/plain mime type as recommended in > Community Guide  >  > https://subversion.apache.org/docs/community-guide/general.html#patches-submission Didn't realize my mail client did send them with the wrong mime-type. Thanks for pointing that out. Donno how to change that atm, looks like I've to inline patches directly in the mail from now on. Regards, Stefan
Description: S/MIME Cryptographic Signature