Re: Tree conflict when an update attempts to remove a directory with unversioned files

2019-01-29 Thread bonsma
On 2019-01-29 13:35, Stefan Sperling wrote: On Tue, Jan 29, 2019 at 01:06:09PM +0100, Stefan Sperling wrote: On Tue, Jan 29, 2019 at 10:48:21AM +0100, Stefan Sperling wrote: > I will look at making 'svn update' detect this case if possible See https://svn.apache.org/r1852436 I have nominated

Re: Tree conflict when an update attempts to remove a directory with unversioned files

2019-01-29 Thread Stefan Sperling
On Tue, Jan 29, 2019 at 01:06:09PM +0100, Stefan Sperling wrote: > On Tue, Jan 29, 2019 at 10:48:21AM +0100, Stefan Sperling wrote: > > I will look at making 'svn update' detect this case if possible > > See https://svn.apache.org/r1852436 I have nominated this change for the 1.11.x, 1.10.x, and

Re: Tree conflict when an update attempts to remove a directory with unversioned files

2019-01-29 Thread Stefan Sperling
On Tue, Jan 29, 2019 at 10:48:21AM +0100, Stefan Sperling wrote: > I will look at making 'svn update' detect this case if possible See https://svn.apache.org/r1852436

Re: Tree conflict when an update attempts to remove a directory with unversioned files

2019-01-29 Thread Stefan Sperling
On Tue, Jan 29, 2019 at 10:48:21AM +0100, Stefan Sperling wrote: > Please note that releases older than SVN 1.10 are no longer supported by > this community. The behaviour of SVN 1.9 won't ever be changed. Sorry, I got mixed up here. Our release planning was recently changed and SVN 1.9.x is indee

Re: Tree conflict when an update attempts to remove a directory with unversioned files

2019-01-29 Thread Stefan Sperling
On Mon, Jan 28, 2019 at 09:24:41PM +0100, bonsma wrote: > Hi all, Hi Erwin, > When we upgraded from Subversion 1.8.17 to Subversion 1.9.7 we > noticed a change in behaviour of svn update. This happens when the > update pulls in a change that deletes a directory while this directory > contains on