[SVN-4677] svn up fails after a file is added, moved, deleted, replaced by a directory, and a file in the directory is deleted

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.9.x, trunk
• Fix Version/s: 1.9.8, 1.10.0
• Component/s: libsvn_fs_fs
• Assignee: Stefan Fuhrmann
• Reporter: Orivej Desh
• Created: 06/Apr/17 03:21
• Updated: 27/Oct/18 16:30
• Resolved: 14/May/17 20:53

Description

This bug was introduced in http://svn.apache.org/viewvc?view=revision&revision=1586953 , is present in all releases since 1.9.0, and can be fixed by reverting that commit. The following script reproduces it:

rm -rf repo repo1 repo2

svnadmin create repo
svn co "file://$(pwd)/repo" repo1

cd repo1
mkdir a
svn add a
svn commit -m 1
svn up

echo fa > a/fa
svn add a/fa
svn commit -m 2
svn up

svn mv a b
svn commit -m 3
svn up

svn rm b/fa
svn commit -m 4
svn up

mkdir b/fa/
touch b/fa/fb
svn add b/fa
svn commit -m 5
svn up

svn rm b/fa/fb
svn commit -m 6
svn up

cd ..
svn co "file://$(pwd)/repo" repo2 -r5
cd repo2
svn up

svn up fails with

Updating '.':
svn: E160016: Failure opening '/b/fa/fb'
svn: E160016: '/b/fa' is not a directory in filesystem '1d2dc934-16b4-452c-a607-a6080764124e'