[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Escape filename for conflict merge

From: James McCoy <jamessan_at_jamessan.com>
Date: Sat, 8 Feb 2020 21:55:10 -0500

On Thu, Dec 26, 2019 at 11:17:20PM -0500, James McCoy wrote:
> On Wed, Dec 11, 2019 at 03:12:56PM +0000, 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.

It looks like update_tests.py's update_accept_conflicts() could be
adapted to test this, by having it rename pi to "p i" before setting up
the conflict. However, I don't really grok the test code. My attempts
to do this have failed.

Any help would be appreciated.


GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB
Received on 2020-02-09 03:55:18 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.