Re: Segfault in libsvn_client/conflicts.c

2021-08-10 Thread Stefan Sperling
On Mon, Aug 09, 2021 at 07:56:27PM -0400, Joshua Kordani wrote: > On my work repo, this causes the crash.  In a small repo where I have > repeated these steps, it does not. Most likely in your test repository the history is arranged such that the deletions can be properly correllated by logging hi

Re: Segfault in libsvn_client/conflicts.c

2021-08-09 Thread Joshua Kordani
So I've traced what happened to the path that causes a segfault, but I can't reproduce it with a simple example. I created develop branch, then a test branch from it. On the test branch I added a file, and merged the toplevel of the test branch back into devel I made a release branch from de

Re: Segfault in libsvn_client/conflicts.c

2021-08-09 Thread Stefan Sperling
On Mon, Aug 09, 2021 at 02:09:40PM -0400, Joshua Kordani wrote: > The shell script is easy.  I run resolve on my codebase :-).  The trick will > be recreating the repo history that reproduces this problem, and that has > always been gnarly to me.  I could use some advice for this. > > Basically, w

Re: Segfault in libsvn_client/conflicts.c

2021-08-09 Thread Joshua Kordani
Actually I was able to trace more of what happened in the repo, and I found a new crash ;-) I will try to script up these steps.  So, I created trunk, a feature branch, and a test branch.  On the test branch I created a file.  I merged the test with the feature.  On the feature, I moved the fi

Re: Segfault in libsvn_client/conflicts.c

2021-08-09 Thread Joshua Kordani
So unfortunately that simple case didn't reproduce the problem. So I need help investigating the state of things... On 8/9/21 14:09, Joshua Kordani wrote: The shell script is easy.  I run resolve on my codebase :-).  The trick will be recreating the repo history that reproduces this problem, a

Re: Segfault in libsvn_client/conflicts.c

2021-08-09 Thread Joshua Kordani
The shell script is easy.  I run resolve on my codebase :-).  The trick will be recreating the repo history that reproduces this problem, and that has always been gnarly to me.  I could use some advice for this. Basically, what I will try to do is create a folder with files. create a branch at

Re: Segfault in libsvn_client/conflicts.c

2021-08-08 Thread Stefan Sperling
On Sun, Aug 08, 2021 at 10:26:43AM +0200, Daniel Sahlberg wrote: > On 2021-08-07 17:14, Joshua Kordani wrote: > > Yes it does appear to fix the issue.  Thank you! > > Hi Joshua (and list), > > I've been trying to reproduce your issue both to have test case for > backporting the fix and possibly a

Re: Segfault in libsvn_client/conflicts.c

2021-08-08 Thread Daniel Sahlberg
On 2021-08-07 17:14, Joshua Kordani wrote: Yes it does appear to fix the issue.  Thank you! Hi Joshua (and list), I've been trying to reproduce your issue both to have test case for backporting the fix and possibly also adding to the test suite. However I can't reproduce it, possibly I misun

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 wil

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 find_r

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 > res