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

Re: Possible bug in the tree conflict resolver: "Accept incoming deletion" option doing nothing for a locally deleted file

From: Stefan Sperling <stsp_at_apache.org>
Date: Tue, 24 Apr 2018 17:32:10 +0200

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.

Received on 2018-04-24 17:32:15 CEST

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.