[#4840] Merge assertion failure in svn_sort__array_insert

2019-12-11 Thread Julian Foad
TL;DR: I'm debugging this issue, and finding multiple problems. This is a summary of where I have got to so far. http://subversion.apache.org/issue/4840 I am investigating an assertion failure. I received a stack trace without parameter values, from which I quote the relevant part: #4 svn_

Re: Escape filename for conflict merge

2019-12-11 Thread Yasuhito FUTATSUKI
On 2019/12/12 0:12, Julian Foad wrote: Stefan Sperling wrote: My first question would be: Could anyone could test this on Windows? (Assuming you've been testing on Debian, as usual.) My next question would be:  What about all the other places we call out to the shell?  Do we already have some

Re: Escape filename for conflict merge

2019-12-11 Thread Julian Foad
Stefan Sperling wrote: My first question would be: Could anyone could test this on Windows? (Assuming you've been testing on Debian, as usual.) My next question would be: What about all the other places we call out to the shell? Do we already have some places that escape filenames even on W

Re: Escape filename for conflict merge

2019-12-11 Thread Stefan Sperling
On Tue, Dec 10, 2019 at 09:55:42PM -0500, James McCoy wrote: > When a text conflict occurs during a merge, the user is given the option > to resolve the conflict and we spawn their editor for them. > > In svn_cmdline__edit_file_externally, we explicitly use the shell to > invoke the editor, so tha