[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: Thu, 13 Feb 2020 21:44:40 -0500

On Thu, Feb 13, 2020 at 07:40:41PM +0000, 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 function change all instances of "r2" to "r3"?

Thanks for the tips. That gave me enough of a nudge in the right
direction to get something that works.

> Or would it work to ensure there's a space in the wcroot_abspath? I.e.,
> in the "svn-test-work" or "update_tests-42/" part of the value of sbox.ospath('foo').

I'll see if that works instead, since it's less churn. If not, I can
fall back to the other approach.

Cheers,

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

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