subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <>
Subject Re: Possible bug in the tree conflict resolver: "Accept incoming deletion" option doing nothing for a locally deleted file
Date Tue, 24 Apr 2018 15:32:10 GMT
On Tue, Apr 24, 2018 at 06:16:00PM +0300, Evgeny Kotkov wrote:
> Hi everyone,
> I think that I might have stumbled across an issue with the new tree conflict
> resolver in case of a delete-vs-delete conflict.  Below is a simple PowerShell-
> based reproduction script that adds a file (r1), removes it (r2), updates to
> the previous revision, removes the file in the working copy (svn rm), and
> attempts an update to r2:

> Should I file an issue or add a regression test for this problem?

Yes please.


View raw message