Hello,

As reported in this users@ thread[1][2], it appears that running `svn
update` can silently remove unversioned files in the working copy when
automatically resolving a tree conflict. Note that when I run `svn update`
with the `--accept postpone` option, the unversioned file remains in the
working copy.

Should I create a ticket in Jira? I have a reproduction script for Windows
and macOS. I guess that the macOS script also works on Linux.

Windows:

svn, version 1.14.2 (r1899510)
   compiled Aug 12 2022, 12:55:13 on x86_64-microsoft-windows6.2.9200
[[[
mkdir C:\marcel-bug-report
svnadmin create C:\marcel-bug-report\MyRepo
svn mkdir file:///C:/marcel-bug-report/MyRepo/MyDir -m "Adding a new
directory"

svn checkout file:///C:/marcel-bug-report/MyRepo/
C:\marcel-bug-report\working-copy-one
echo foo > C:\marcel-bug-report\working-copy-one\MyDir\myfile.txt
svn add C:\marcel-bug-report\working-copy-one\MyDir\myfile.txt
svn commit C:\marcel-bug-report\working-copy-one\ -m "Adding a new file"
echo bar > C:\marcel-bug-report\working-copy-one\MyDir\myfile.txt
echo baz > C:\marcel-bug-report\working-copy-one\MyDir\unversionedfile.txt

svn move file:///C:/marcel-bug-report/MyRepo/MyDir
file:///C:/marcel-bug-report/MyRepo/RenamedDir -m "Renaming a directory"

svn update C:\marcel-bug-report\working-copy-one
]]]

macOS

svn, version 1.14.2 (r1899510)
   compiled Apr 13 2022, 14:56:48 on arm-apple-darwin21.3.0
[[[
mkdir $HOME/marcel-bug-report
svnadmin create $HOME/marcel-bug-report/MyRepo
svn mkdir file:///$HOME/marcel-bug-report/MyRepo/MyDir -m "Adding a new
directory"

svn checkout file:///$HOME/marcel-bug-report/MyRepo/
$HOME/marcel-bug-report/working-copy-one
echo foo > $HOME/marcel-bug-report/working-copy-one/MyDir/myfile.txt
svn add $HOME/marcel-bug-report/working-copy-one/MyDir/myfile.txt
svn commit $HOME/marcel-bug-report/working-copy-one/ -m "Adding a new file"
echo bar > $HOME/marcel-bug-report/working-copy-one/MyDir/myfile.txt
echo baz >
$HOME/marcel-bug-report/working-copy-one/MyDir/unversionedfile.txt

svn move file:///$HOME/marcel-bug-report/MyRepo/MyDir
file:///$HOME/marcel-bug-report/MyRepo/RenamedDir -m "Renaming a directory"

svn update $HOME/marcel-bug-report/working-copy-one/
]]]

Thank you.

[1]: https://lists.apache.org/thread/qmg6xqs5xpjr6kyhblwxvnhykobxwm8x
[2]: https://lists.apache.org/thread/phpotj6pvvcmlt1vx9y7lbn6vof0d6y2

-- 
With best regards,
Pavel Lyalyakin
VisualSVN Team

Reply via email to