Re: Escape filename for conflict merge

2020-02-13 Thread James McCoy
On Thu, Feb 13, 2020 at 07:40:41PM +, Daniel Shahaf wrote: > So in this case, to rename pi to "p i" you'll probably want start the > test by doing that rename as an 'svn mv' (svntest.main.run_svn()), > commit it as r2, run update (sbox.simple_update()), and then in the > remainder of the test f

Re: Escape filename for conflict merge

2020-02-13 Thread Daniel Shahaf
James McCoy wrote on Sun, 09 Feb 2020 02:55 +00:00: > On Thu, Dec 26, 2019 at 11:17:20PM -0500, James McCoy wrote: > > On Wed, Dec 11, 2019 at 03:12:56PM +, Julian Foad wrote: > > > Stefan Sperling wrote: > > > > My first question would be: Could anyone could test this on > > > > Windows? (Assu

Re: Escape filename for conflict merge

2020-02-08 Thread James McCoy
On Thu, Dec 26, 2019 at 11:17:20PM -0500, James McCoy wrote: > On Wed, Dec 11, 2019 at 03:12:56PM +, 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.) > > Yes, any t

Re: Escape filename for conflict merge

2019-12-26 Thread James McCoy
On Wed, Dec 11, 2019 at 03:12:56PM +, 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.) Yes, any testing from folks with Windows systems would be welcome. This recipe is

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

Escape filename for conflict merge

2019-12-10 Thread James McCoy
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 that $SVN_EDITOR can be a command with arguments rather than just a binary