Re: Segfault in libsvn_client/conflicts.c

2021-08-07 Thread Stefan Sperling
On Sat, Aug 07, 2021 at 06:32:34AM -0400, Joshua Kordani wrote: > Thank you for explaining the convention, it makes sense now that you > describe it like that. > > It was delightfully short work to hunt down with the rr debugger ;-) > > I'm having trouble testing it right now but I suspect it

Re: Segfault in libsvn_client/conflicts.c

2021-08-07 Thread Joshua Kordani
Yes it does appear to fix the issue.  Thank you! On 8/7/21 06:32, Joshua Kordani wrote: Thank you for explaining the convention, it makes sense now that you describe it like that. It was delightfully short work to hunt down with the rr debugger ;-) I'm having trouble testing it right now but

Re: Segfault in libsvn_client/conflicts.c

2021-08-07 Thread Joshua Kordani
Thank you for explaining the convention, it makes sense now that you describe it like that. It was delightfully short work to hunt down with the rr debugger ;-) I'm having trouble testing it right now but I suspect it will work, I'll get back to you on this. There is another caller of

Re: Segfault in libsvn_client/conflicts.c

2021-08-07 Thread Stefan Sperling
On Fri, Aug 06, 2021 at 07:41:42PM -0400, Joshua Kordani wrote: > I am merging two branches together, A into B.  In A, I deleted a file and > cherrypicked that onto B.  Later, I want to merge at the toplevel from A > into B, and I get a segfault when svn tries to figure out how to resolve the >