Stefan Sperling <s...@elego.de> writes: > On Tue, Feb 04, 2014 at 11:49:24AM +0200, Florin Avram wrote: >> Hi, >> >> I noticed that SVN 1.8.5 does not give warnings for some situations, when >> using "svn delete" (previously, using SVN 1.7.x, it did): >> >> 1. have a file replaced with a directory in the working copy: >> - svn delete file >> - create new directory, with the same name as the file >> - svn add file (the directory; item is reported as replaced) >> - svn delete file - no warning. >> But, if trying to delete an added file, it warns. Shouldn't be something >> similar in this case, since replaced = deleted + added ?! > > I cannot reproduce this. Can you please provide command sequences > and their output instead of a verbal description? Below is what I did.
It's file replaced by directory: svnadmin create repo --compatible-version 1.7 svn import -mm repo/format file://`pwd`/repo/A/f svn co file://`pwd`/repo wc svn rm wc/A/f svn mkdir wc/A/f svn rm wc/A/f with 1.8 the last rm succeeds, with 1.7 the last rm fails unless --force is used: svn: E195006: Use --force to override this restriction (local modifications may be lost) svn: E195006: '/tmp/wc/A/f' has local modifications -- commit or revert them first Some things still cause 1.8 to require force: setting properties on the directory or children, adding file children. -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*