[SVN-4739] Tree conflict resolver: "Accept incoming deletion" option doing nothing for a locally deleted file

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 1.10.0
• Component/s: cmdline client
• Assignee: Stefan Sperling
• Reporter: Evgeny Kotkov
• Created: 25/Apr/18 14:08
• Updated: 02/Jan/22 11:33
• Resolved: 02/Jan/22 11:33

Description

Within the tree conflict resolver, using the "Accept incoming deletion" option for a locally deleted file can (unexpectedly) do nothing and leave the tree conflict unresolved.

Consider the following PowerShell-based reproduction script:

    rm test -Recurse -Force -ErrorAction Ignore
    mkdir test
    svnadmin create test/repo
    $url = 'file:///{0}/test/repo' -f (pwd) -replace '\\', '/'
    svn co $url test/wc
    echo content > test/wc/file.txt
    svn add test/wc/file.txt
    svn ci test/wc -m"r1"
    svn rm test/wc/file.txt
    svn ci test/wc -m"r2"
    svn up test/wc -r1
    svn rm test/wc/file.txt
    svn up test/wc
    svn st test/wc

The result of choosing "(a) Accept incoming deletion" during conflict resolution is unexpected:

  > svn up

    Updating 'test\wc':
    C test\wc\file.txt
    At revision 2.
    Summary of conflicts:
    Tree conflicts: 1
    Searching tree conflict details for 'test\wc\file.txt' in repository:
    Checking r2... done
    Tree conflict on 'test\wc\file.txt':
    File updated from r1 to r2 was deleted by (me) in r2.
    A deleted file was found in the working copy.
    Select: (p) Postpone, (r) Mark as resolved, (a) Accept incoming deletion,
    (h) Help, (q) Quit resolution: a
    Summary of conflicts:
    Tree conflicts: 1

    > svn st

    ! C test\wc\file.txt
    > local file delete, incoming file delete or move upon update
    Summary of conflicts:
    Tree conflicts: 1